Hello community, here is the log from the commit of package cloud-init for openSUSE:Leap:15.2 checked in at 2020-04-25 19:04:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/cloud-init (Old) and /work/SRC/openSUSE:Leap:15.2/.cloud-init.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Sat Apr 25 19:04:41 2020 rev:40 rq:796785 version:19.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/cloud-init/cloud-init.changes 2020-03-24 19:05:29.237484425 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.cloud-init.new.2738/cloud-init.changes 2020-04-25 19:04:42.527547263 +0200 @@ -1,0 +2,26 @@ +Fri Mar 27 12:21:00 UTC 2020 - Robert Schweikert <[email protected]> + +- Update cloud-init-write-routes.patch + + In cases where the config contains 2 or more default gateway + specifications for an interface only write the first default route, + log warning message about skipped routes + + Avoid writing invalid route specification if neither the network + nor destination is specified in the route configuration + +------------------------------------------------------------------- +Thu Mar 26 17:20:12 UTC 2020 - Robert Schweikert <[email protected]> + +- Update cloud-init-write-routes.patch + + Still need to consider the "network" configuration uption + for the v1 config implementation. Fixes regression + introduced with update from Wed Feb 12 19:30:42 + +------------------------------------------------------------------- +Wed Mar 25 18:31:32 UTC 2020 - Robert Schweikert <[email protected]> + +- Update cloud-init-write-routes.patch (bsc#1165296) + + Add the default gateway to the ifroute config file when specified + as part of the subnet configuration + + Fix typo to properly extrakt provided netmask data (bsc#1163178) + +------------------------------------------------------------------- @@ -21,0 +48,6 @@ +Fri Jan 24 14:49:35 UTC 2020 - Dominique Leuenberger <[email protected]> + +- BuildRequire pkgconfig(udev) instead of udev: allow OBS to + shortcut through the -mini flavor. + +------------------------------------------------------------------- @@ -253 +285 @@ -- Update to cloud-init 19.2 (bsc#1099358) +- Update to cloud-init 19.2 (bsc#1099358, bsc#1145622) @@ -332 +364 @@ -- Update cloud-init-write-routes.patch (bsc#1144881) +- Update cloud-init-write-routes.patch (boo#1144881, bsc#1148645) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.O4I2x5/_old 2020-04-25 19:04:42.999548278 +0200 +++ /var/tmp/diff_new_pack.O4I2x5/_new 2020-04-25 19:04:42.999548278 +0200 @@ -53,7 +53,7 @@ # pkg-config is needed to find correct systemd unit dir BuildRequires: pkg-config # needed for /lib/udev -BuildRequires: udev +BuildRequires: pkgconfig(udev) %if 0%{?suse_version} > 1320 BuildRequires: python3-devel BuildRequires: python3-setuptools ++++++ cloud-init-write-routes.patch ++++++ --- /var/tmp/diff_new_pack.O4I2x5/_old 2020-04-25 19:04:43.047548382 +0200 +++ /var/tmp/diff_new_pack.O4I2x5/_new 2020-04-25 19:04:43.051548390 +0200 @@ -8,7 +8,7 @@ from cloudinit import helpers from cloudinit import log as logging -@@ -172,7 +173,53 @@ class Distro(distros.Distro): +@@ -172,7 +173,69 @@ class Distro(distros.Distro): util.write_file(out_fn, str(conf), 0o644) def _write_network_config(self, netconfig): @@ -31,32 +31,48 @@ + if_name = config.get('name') + subnets = config.get('subnets', []) + config_routes = '' ++ has_default_route = False + for subnet in subnets: ++ # Render the default gateway if it is present ++ gateway = subnet.get('gateway') ++ if gateway: ++ config_routes += ' '.join( ++ ['default', gateway, '-', '-\n'] ++ ) ++ has_default_route = True ++ # Render subnet routes + routes = subnet.get('routes', []) + for route in routes: -+ dest = route.get('destination') -+ if dest in default_nets: ++ dest = route.get('destination') or route.get('network') ++ if not dest or dest in default_nets: + dest = 'default' + if dest != 'default': -+ netmask = route.get('genmask') ++ netmask = route.get('netmask') + if netmask: + prefix = mask_to_net_prefix(netmask) + dest += '/' + str(prefix) + if '/' not in dest: + LOG.warning( -+ 'Route destination has no prefix "%s"', dest ++ 'Skipping route; has no prefix "%s"', dest + ) ++ continue ++ if dest == 'default' and has_default_route: ++ LOG.warning( ++ '%s already has default route, skipping "%s"', ++ if_name, ' '.join([dest, gateway, '-', '-']) ++ ) ++ continue ++ if dest == 'default' and not has_default_route: ++ has_default_route = True + gateway = route.get('gateway') ++ if not gateway: ++ LOG.warning( ++ 'Missing gateway for "%s", skipping', dest ++ ) ++ continue + config_routes += ' '.join( + [dest, gateway, '-', '-\n'] + ) -+ if not config_routes: -+ dest = 'default' -+ gateway = subnet.get('gateway') -+ if gateway: -+ config_routes += ' '.join( -+ [dest, gateway, '-', '-\n'] -+ ) + if config_routes: + route_file = '/etc/sysconfig/network/ifroute-%s' % if_name + util.write_file(route_file, config_routes)
