apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.16'

Browse Source
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
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/lib/cloudutils/serviceConfig.py
View File

@ -374,6 +374,9 @@ class networkConfigSUSE(serviceCfgBase, networkConfigBase):
if self.syscfg.env.bridgeType == "openvswitch": if self.syscfg.env.bridgeType == "openvswitch":
if cfo.getEntry("IPADDR"): if cfo.getEntry("IPADDR"):
cfo.rmEntry("IPADDR", 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: else:
raise CloudInternalException("Unknown network.bridge.type %s" % self.syscfg.env.bridgeType) raise CloudInternalException("Unknown network.bridge.type %s" % self.syscfg.env.bridgeType)
cfo.save() cfo.save()