rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

Accepting request 807342 from home:jgleissner:branches:Cloud:Tools

Browse Source 
Handle netconfig v2 device configurations (bsc#1171546)

OBS-URL: https://build.opensuse.org/request/show/807342
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=169
This commit is contained in:
Robert Schweikert 2020-05-19 19:06:35 +00:00 committed by Git OBS Bridge
parent ea84c3187e
commit ae005709db
2 changed files with 84 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cloud-init-write-routes.patch
View File

@ -1,3 +1,5 @@
Index: cloudinit/distros/opensuse.py
===================================================================
--- cloudinit/distros/opensuse.py.orig
+++ cloudinit/distros/opensuse.py
@@ -11,6 +11,7 @@
@ -8,7 +10,7 @@
from cloudinit import helpers
from cloudinit import log as logging
@@ -172,7 +173,69 @@ class Distro(distros.Distro):
@@ -174,7 +175,137 @@ class Distro(distros.Distro):
util.write_file(out_fn, str(conf), 0o644)
def _write_network_config(self, netconfig):
@ -18,7 +20,7 @@
+ self._write_routes(netconfig)
+ return net_apply_res
+
+ def _write_routes(self, netconfig):
+ def _write_routes_v1(self, netconfig):
+ """Write route files, not part of the standard distro interface"""
+ # Due to the implementation of the sysconfig renderer default routes
+ # are setup in ifcfg-* files. But this does not work on SLES or
@ -76,6 +78,74 @@
+ if config_routes:
+ route_file = '/etc/sysconfig/network/ifroute-%s' % if_name
+ util.write_file(route_file, config_routes)
+
+ def _render_route_string(self, netconfig_route):
+ route_to = netconfig_route.get('to', None)
+ route_via = netconfig_route.get('via', None)
+ route_metric = netconfig_route.get('metric', None)
+ route_string = ''
+
+ if route_to and route_via:
+ route_string = ' '.join([route_to, route_via, '-', '-'])
+ if route_metric:
+ route_string += ' metric {}\n'.format(route_metric)
+ else:
+ route_string += '\n'
+ else:
+ LOG.warning('invalid route definition, skipping route')
+
+ return route_string
+
+ def _write_routes_v2(self, netconfig):
+ for device_type in netconfig:
+ if device_type == 'version':
+ continue
+
+ if device_type == 'routes':
+ # global static routes
+ config_routes = ''
+ for route in netconfig['routes']:
+ config_routes += self._render_route_string(route)
+ if config_routes:
+ route_file = '/etc/sysconfig/network/routes'
+ util.write_file(route_file, config_routes)
+ else:
+ devices = netconfig[device_type]
+ for device_name in devices:
+ config_routes = ''
+ device_config = devices[device_name]
+ try:
+ gateways = [
+ v for k, v in device_config.items()
+ if 'gateway' in k
+ ]
+ for gateway in gateways:
+ config_routes += ' '.join(
+ ['default', gateway, '-', '-\n']
+ )
+ for route in device_config.get('routes', []):
+ config_routes += self._render_route_string(route)
+ if config_routes:
+ route_file = '/etc/sysconfig/network/ifroute-{}'.format(
+ device_name
+ )
+ util.write_file(route_file, config_routes)
+ except Exception:
+ # the parser above epxects another level of nesting
+ # which should be there in case it's properly
+ # formatted; if not we may get an exception on items()
+ pass
+
+ def _write_routes(self, netconfig):
+ netconfig_ver = netconfig.get('version')
+ if netconfig_ver == 1:
+ self._write_routes_v1(netconfig)
+ elif netconfig_ver == 2:
+ self._write_routes_v2(netconfig)
+ else:
+ LOG.warning(
+ 'unsupported or missing netconfig version, not writing routes'
+ )
@property
def preferred_ntp_clients(self):

12
cloud-init.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue May 19 11:51:18 UTC 2020 - Joachim Gleissner <jgleissner@suse.com>
- Update cloud-init-write-routes.patch
+ Explicitly test for netconfig version 1 as well as 2
-------------------------------------------------------------------
Mon May 18 14:37:30 UTC 2020 - Joachim Gleissner <jgleissner@suse.com>
- Update cloud-init-write-routes.patch
+ Handle netconfig v2 device configurations (bsc#1171546)
-------------------------------------------------------------------
Fri Mar 27 12:21:00 UTC 2020 - Robert Schweikert <rjschwei@suse.com>