- Update cloud-init-write-routes.patch (bsc#1177526)

+ Avoid exception if no gateway information is present and warning
    is triggered for existing routing.

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=174
This commit is contained in:
Robert Schweikert 2020-10-17 10:31:14 +00:00 committed by Git OBS Bridge
parent 04ac085278
commit b0c63d0e77
2 changed files with 12 additions and 2 deletions

View File

@ -10,7 +10,7 @@ Index: cloudinit/distros/opensuse.py
from cloudinit import helpers
from cloudinit import log as logging
@@ -174,7 +175,137 @@ class Distro(distros.Distro):
@@ -174,7 +175,140 @@ class Distro(distros.Distro):
util.write_file(out_fn, str(conf), 0o644)
def _write_network_config(self, netconfig):
@ -59,9 +59,12 @@ Index: cloudinit/distros/opensuse.py
+ )
+ continue
+ if dest == 'default' and has_default_route:
+ dest_info = dest
+ if gateway:
+ dest_info = ' '.join([dest, gateway, '-', '-'])
+ LOG.warning(
+ '%s already has default route, skipping "%s"',
+ if_name, ' '.join([dest, gateway, '-', '-'])
+ if_name, dest_info
+ )
+ continue
+ if dest == 'default' and not has_default_route:

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Oct 17 10:25:30 UTC 2020 - Robert Schweikert <rjschwei@suse.com>
- Update cloud-init-write-routes.patch (bsc#1177526)
+ Avoid exception if no gateway information is present and warning
is triggered for existing routing.
-------------------------------------------------------------------
Fri Jul 24 19:55:40 UTC 2020 - Robert Schweikert <rjschwei@suse.com>