diff --git a/cloud-init-write-routes.patch b/cloud-init-write-routes.patch index 92573e8..275faf1 100644 --- a/cloud-init-write-routes.patch +++ b/cloud-init-write-routes.patch @@ -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,60 @@ class Distro(distros.Distro): util.write_file(out_fn, str(conf), 0o644) def _write_network_config(self, netconfig): @@ -32,13 +32,20 @@ + subnets = config.get('subnets', []) + config_routes = '' + for subnet in subnets: ++ # Render the default gateway if it is present ++ gateway = subnet.get('gateway') ++ if gateway: ++ config_routes += ' '.join( ++ ['default', gateway, '-', '-\n'] ++ ) ++ # Render subnet routes + routes = subnet.get('routes', []) + for route in routes: + dest = route.get('destination') + if 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) diff --git a/cloud-init.changes b/cloud-init.changes index d02fec8..4315ca8 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 25 18:31:32 UTC 2020 - Robert Schweikert + +- 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) + ------------------------------------------------------------------- Thu Feb 13 14:07:50 UTC 2020 - Robert Schweikert