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

- Modify cloud-init-write-routes.patch (bsc#1125992)

Browse Source 
+ Fix the order of calls, the SUSE imaplementation of route config file
    writing must clobber the default implementation.

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=135
This commit is contained in:
Robert Schweikert 2019-02-22 16:22:45 +00:00 committed by Git OBS Bridge
parent ba0d82f7d8
commit 64e78007b9
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,15 @@
--- cloudinit/distros/opensuse.py.orig
+++ cloudinit/distros/opensuse.py
@@ -172,8 +172,40 @@ class Distro(distros.Distro):
@@ -172,7 +172,41 @@ class Distro(distros.Distro):
util.write_file(out_fn, str(conf), 0o644)
def _write_network_config(self, netconfig):
- return self._supported_write_network_config(netconfig)
+ net_apply_res = self._supported_write_network_config(netconfig)
+ # Clobber the route files that were written in RH key-value style
+ self._write_routes(netconfig)
return self._supported_write_network_config(netconfig)
+ return net_apply_res
+
+ def _write_routes(self, netconfig):
+ """Write route files, not part of the standard distro interface"""
+ # Due to the implementation of the sysconfig renderer default routes
@ -37,7 +40,6 @@
+ if config_routes:
+ route_file = '/etc/sysconfig/network/ifroute-%s' % if_name
+ util.write_file(route_file, config_routes)
+
@property
def preferred_ntp_clients(self):
"""The preferred ntp client is dependent on the version."""

7
cloud-init.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 22 16:20:28 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
- Modify cloud-init-write-routes.patch (bsc#1125992)
+ Fix the order of calls, the SUSE imaplementation of route config file
writing must clobber the default implementation.
-------------------------------------------------------------------
Fri Feb 22 00:42:14 UTC 2019 - Robert Schweikert <rjschwei@suse.com>