Merge branch '4.16'

This commit is contained in:
nvazquez 2022-03-23 13:42:54 -03:00
commit 6d9b60adfb
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84

View File

@ -374,6 +374,9 @@ class networkConfigSUSE(serviceCfgBase, networkConfigBase):
if self.syscfg.env.bridgeType == "openvswitch":
if cfo.getEntry("IPADDR"):
cfo.rmEntry("IPADDR", cfo.getEntry("IPADDR"))
elif self.syscfg.env.bridgeType == "native":
# Bridge is linked to the dev in SUSE not the other way round
pass
else:
raise CloudInternalException("Unknown network.bridge.type %s" % self.syscfg.env.bridgeType)
cfo.save()