Control: tag -1 - moreinfo On Sun, May 12, 2024 at 09:14:14PM +0100, Jonathan Wiltshire wrote: > > There are pros and cons to each option. Given bullseye's age and > > cloud-init's blast radius (a regression could potentially disrupt the > > provisioning process of cloud VMs, which is particularly disruptive in > > such environments) I lean toward option (2) above, as it minimizes the > > changes. The obvious drawback is that we now have two versions of > > cloud-init in the bullseye repositories, which was not the case > > previously. The cloud team is committed to supporting this situation > > for the duration of the bullseye LTS lifetime. > > I think I lean towards option 2 as well. I assume the versioning is > calendar-based not semantic, so it's hard to know how disruptive 20.x -> > 22.x would be, and meaningful testing across all the platforms it could be > deployed on is unrealistic.
Yes, cloud-init has a very large configuration interface, and is under pretty constant development and refactoring. We have in the past discussed with the release team the possibility of updating it (and some of the other cloud related packages) with some regularity, but have never actually followed through with it. While there are some good reasons for doing a distro-wide update, this point in the bullseye lifecycle probably isn't the best time to start. > > Can you attach proposed debian/control and debian/changelog files please? > See the complete debian/control attached. The full diff between the bookworm version and the proposed bullseye version is below. There were some minor changes to debian/rules to cope with the package name change. diff --git a/debian/changelog b/debian/changelog index 9bd33d11..bc3b921c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloud-init-22.4.2 (22.4.2-2~bpo11+1) bullseye-security; urgency=medium + + * Rename package to cloud-init-22.4.2 for bullseye-lts + + -- Noah Meyerhans <no...@debian.org> Tue, 30 Apr 2024 13:14:06 -0700 + cloud-init (22.4.2-1) unstable; urgency=medium [ Bastian Blank ] diff --git a/debian/control b/debian/control index fff0d87f..0d26a1fa 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: cloud-init +Source: cloud-init-22.4.2 Maintainer: Debian Cloud Team <debian-cl...@lists.debian.org> Uploaders: Bastian Blank <wa...@debian.org>, @@ -38,8 +38,11 @@ Vcs-Browser: https://salsa.debian.org/cloud-team/cloud-init Vcs-Git: https://salsa.debian.org/cloud-team/cloud-init.git Homepage: https://launchpad.net/cloud-init -Package: cloud-init +Package: cloud-init-22.4.2 Architecture: all +Conflicts: cloud-init +Replaces: cloud-init (<< 22.4.2) +Provides: cloud-init Depends: eject, fdisk | util-linux (<< 2.29.2-3~), @@ -68,3 +71,7 @@ Description: initialization system for infrastructure cloud instances . Various methods are supported for passing data to the instance at launch time, including the standard interfaces of multiple platforms. + . + This versioned cloud-init-22.4.2 package exists to allow two + cloud-init package versions to co-exist in the Debian archive during + the Debian 11 LTS support period. diff --git a/debian/rules b/debian/rules index 3c302ff8..db302a4e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,13 +3,24 @@ PYTHON3S:=$(shell py3versions -vr) export PYBUILD_INSTALL_ARGS=--init-system=systemd,sysvinit_deb +pkgver:=22.4.2 + +execute_before_dh_prep: + for extension in install lintian-overrides manpages postinst postrm; do \ + cp -v debian/cloud-init.$${extension} \ + debian/cloud-init-$(pkgver).$${extension} ;\ + done + +execute_after_dh_clean: + -rm -vf debian/cloud-init-$(pkgver).* + %: dh $@ --with python3 --buildsystem pybuild override_dh_auto_install: dh_auto_install - mv $(CURDIR)/debian/cloud-init/etc/NetworkManager/dispatcher.d/hook-network-manager \ - $(CURDIR)/debian/cloud-init/etc/NetworkManager/dispatcher.d/cloud-init-hook-network-manager + mv $(CURDIR)/debian/cloud-init-$(pkgver)/etc/NetworkManager/dispatcher.d/hook-network-manager \ + $(CURDIR)/debian/cloud-init-$(pkgver)/etc/NetworkManager/dispatcher.d/cloud-init-hook-network-manager override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
Source: cloud-init-22.4.2 Maintainer: Debian Cloud Team <debian-cl...@lists.debian.org> Uploaders: Bastian Blank <wa...@debian.org>, Thomas Goirand <z...@debian.org>, Noah Meyerhans <no...@debian.org>, Section: admin Priority: optional Build-Depends: debhelper (>= 10), dh-python, iproute2, po-debconf, pylint, python3-all, python3-pep8, python3-setuptools, Build-Depends-Indep: python3-configobj, python3-contextlib2, python3-httpretty (>= 0.9.5), python3-jinja2, python3-jsonpatch, python3-jsonschema, python3-mock, python3-netifaces, python3-oauthlib, python3-pyflakes, python3-pytest, python3-pytest-mock, python3-requests, python3-responses, python3-serial, python3-unittest2, python3-yaml, Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/cloud-team/cloud-init Vcs-Git: https://salsa.debian.org/cloud-team/cloud-init.git Homepage: https://launchpad.net/cloud-init Package: cloud-init-22.4.2 Architecture: all Conflicts: cloud-init Replaces: cloud-init (<< 22.4.2) Provides: cloud-init Depends: eject, fdisk | util-linux (<< 2.29.2-3~), gdisk, isc-dhcp-client, locales, lsb-base, lsb-release, procps, ${misc:Depends}, ${python3:Depends}, Recommends: cloud-guest-utils, eatmydata, sudo, Suggests: btrfs-progs, e2fsprogs, xfsprogs, Description: initialization system for infrastructure cloud instances Cloud-init provides a framework and tool to configure and customize virtual machine instances for Infrastructure-as-a-Service (IaaS) clouds platforms. It can for example set a default locale and hostname, generate SSH private host keys, install SSH public keys for logging into a default account, set up ephemeral mount points, and run user-provided scripts. . Various methods are supported for passing data to the instance at launch time, including the standard interfaces of multiple platforms. . This versioned cloud-init-22.4.2 package exists to allow two cloud-init package versions to co-exist in the Debian archive during the Debian 11 LTS support period.