Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2020-12-09 22:12:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Wed Dec 9 22:12:15 2020 rev:76 rq:853763 version:20.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2020-10-20 16:10:18.078006691 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-init.new.2328/cloud-init.changes 2020-12-09 22:12:15.707118157 +0100 @@ -1,0 +2,25 @@ +Tue Nov 24 21:14:56 UTC 2020 - Robert Schweikert <[email protected]> + +- Add wget as a requirement (bsc#1178029) + + wget is used in the CloudStack data source + +------------------------------------------------------------------- +Tue Nov 24 12:40:00 UTC 2020 - Robert Schweikert <[email protected]> + +- Add cloud-init-azure-def-usr-pass.patch (bsc#1179150, bsc#1179151) + + Properly set the password for the default user in all circumstances + +------------------------------------------------------------------- +Fri Nov 13 19:44:11 UTC 2020 - Robert Schweikert <[email protected]> + +- Patch the full package version into the cloud-init version file + +------------------------------------------------------------------- +Tue Nov 10 11:39:09 UTC 2020 - Robert Schweikert <[email protected]> + +- Update cloud-init-write-routes.patch (bsc#1177526) + + Fix missing default route when dual stack network setup is used. Once + a default route was configured for Ipv6 or IPv4 the default route + configuration for the othre protocol was skipped. + +------------------------------------------------------------------- @@ -18,0 +44 @@ + (jsc#PM-2335) New: ---- cloud-init-azure-def-usr-pass.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.MjyqP3/_old 2020-12-09 22:12:16.215118672 +0100 +++ /var/tmp/diff_new_pack.MjyqP3/_new 2020-12-09 22:12:16.219118677 +0100 @@ -38,6 +38,8 @@ Patch57: cloud-init-no-tempnet-oci.patch Patch58: cloud-init-after-kvp.diff Patch59: cloud-init-recognize-hpc.patch +# FIXME https://github.com/canonical/cloud-init/commit/eea754492f074e00b601cf77aa278e3623857c5a +Patch60: cloud-init-azure-def-usr-pass.patch BuildRequires: fdupes BuildRequires: filesystem # pkg-config is needed to find correct systemd unit dir @@ -83,6 +85,7 @@ Requires: python3-xml Requires: sudo Requires: util-linux +Requires: wget Requires: wicked-service Requires: cloud-init-config = %configver BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -134,6 +137,12 @@ %patch57 %patch58 -p1 %patch59 +%patch60 +# patch in the full version to version.py +version_pys=$(find . -name version.py -type f) +[ -n "$version_pys" ] || + { echo "failed to find 'version.py' to patch with version." 1>&2; exit 1; } +sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," $version_pys %build python3 setup.py build ++++++ cloud-init-azure-def-usr-pass.patch ++++++ --- cloudinit/sources/DataSourceAzure.py.orig +++ cloudinit/sources/DataSourceAzure.py @@ -1206,7 +1206,7 @@ def read_azure_ovf(contents): if password: defuser['lock_passwd'] = False if DEF_PASSWD_REDACTION != password: - defuser['passwd'] = encrypt_pass(password) + defuser['passwd'] = cfg['password'] = encrypt_pass(password) if defuser: cfg['system_info'] = {'default_user': defuser} ++++++ cloud-init-write-routes.patch ++++++ --- /var/tmp/diff_new_pack.MjyqP3/_old 2020-12-09 22:12:16.287118745 +0100 +++ /var/tmp/diff_new_pack.MjyqP3/_new 2020-12-09 22:12:16.287118745 +0100 @@ -10,7 +10,7 @@ from cloudinit import helpers from cloudinit import log as logging -@@ -174,7 +175,140 @@ class Distro(distros.Distro): +@@ -174,7 +175,147 @@ class Distro(distros.Distro): util.write_file(out_fn, str(conf), 0o644) def _write_network_config(self, netconfig): @@ -34,6 +34,7 @@ + subnets = config.get('subnets', []) + config_routes = '' + has_default_route = False ++ seen_default_gateway = None + for subnet in subnets: + # Render the default gateway if it is present + gateway = subnet.get('gateway') @@ -42,6 +43,8 @@ + ['default', gateway, '-', '-\n'] + ) + has_default_route = True ++ if not seen_default_gateway: ++ seen_default_gateway = gateway + # Render subnet routes + routes = subnet.get('routes', []) + for route in routes: @@ -58,7 +61,11 @@ + 'Skipping route; has no prefix "%s"', dest + ) + continue -+ if dest == 'default' and has_default_route: ++ if ( ++ dest == 'default' and ++ has_default_route and ++ gateway == seen_default_gateway ++ ): + dest_info = dest + if gateway: + dest_info = ' '.join([dest, gateway, '-', '-']) _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
