Change in vdsm[master]: net: persist bonding 'switch' parameter
phoracek at redhat.com
phoracek at redhat.com
Thu Apr 7 14:32:25 UTC 2016
Petr Horáček has uploaded a new change for review.
Change subject: net: persist bonding 'switch' parameter
......................................................................
net: persist bonding 'switch' parameter
Legacy configurators do not pass all bonding arguments to
BaseConfig:setBonding() (but it pass everything to setNetwork()),
so we need to persist 'switch' parameter explicitly.
Change-Id: Ica95fc047c7338f5745f490cd262f016d193562d
Bug-Url: https://bugzilla.redhat.com/1195208
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M lib/vdsm/network/configurators/ifcfg.py
M lib/vdsm/network/configurators/iproute2.py
2 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/55825/1
diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py
index 0891c8e..6c74472 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -126,7 +126,8 @@
if self.unifiedPersistence:
self.runningConfig.setBonding(
bond.name, {'options': bond.options,
- 'nics': [slave.name for slave in bond.slaves]})
+ 'nics': [slave.name for slave in bond.slaves],
+ 'switch': 'legacy'})
def editBonding(self, bond, _netinfo):
"""
@@ -168,7 +169,8 @@
if self.unifiedPersistence:
self.runningConfig.setBonding(
bond.name, {'options': bond.options,
- 'nics': [slave.name for slave in bond.slaves]})
+ 'nics': [slave.name for slave in bond.slaves],
+ 'switch': 'legacy'})
def configureNic(self, nic, **opts):
self.configApplier.addNic(nic, **opts)
diff --git a/lib/vdsm/network/configurators/iproute2.py b/lib/vdsm/network/configurators/iproute2.py
index dbe5a23..1d84083 100644
--- a/lib/vdsm/network/configurators/iproute2.py
+++ b/lib/vdsm/network/configurators/iproute2.py
@@ -106,7 +106,8 @@
self._addSourceRoute(bond)
self.runningConfig.setBonding(
bond.name, {'options': bond.options,
- 'nics': [slave.name for slave in bond.slaves]})
+ 'nics': [slave.name for slave in bond.slaves],
+ 'switch': 'legacy'})
def editBonding(self, bond, _netinfo):
"""
@@ -139,7 +140,8 @@
self.configApplier.ifup(bond)
self.runningConfig.setBonding(
bond.name, {'options': bond.options,
- 'nics': [slave.name for slave in bond.slaves]})
+ 'nics': [slave.name for slave in bond.slaves],
+ 'switch': 'legacy'})
def configureNic(self, nic, **opts):
DynamicSourceRoute.addInterfaceTracking(nic)
--
To view, visit https://gerrit.ovirt.org/55825
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica95fc047c7338f5745f490cd262f016d193562d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek at redhat.com>
More information about the vdsm-patches
mailing list