[node-patches] Change in ovirt-node[master]: network: Fix bonding opts

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: network: Fix bonding opts
......................................................................

network: Fix bonding opts

Previously the bonding opts were also written to the BOOTIF device even
if it wasn't a bond. This is now fixed and the bonding options are only
written ito the bonding configuration file.

Change-Id: I5b8a36c53dcd4f96ad83392c6e0be2ff8de660b9
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/config/defaults.py
M tests/nose/network_config.py
2 files changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/55/16455/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index 8ea4ab8..26fe1f7 100644
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -340,7 +340,6 @@
                 m = Network().retrieve()
                 m_dns = Nameservers().retrieve()
                 m_ipv6 = IPv6().retrieve()
-                m_bond = NicBonding().retrieve()
 
                 cfg.bootproto = m["bootproto"]
                 cfg.ipaddr = m["ipaddr"] or None
@@ -365,10 +364,6 @@
                     cfg.ipv6addr = "%s/%s" % (m_ipv6["ipaddr"],
                                               m_ipv6["netmask"])
                     cfg.ipv6_defaultgw = m_ipv6["gateway"]
-
-                if m_bond["name"]:
-                    cfg.hwaddr = None
-                    cfg.bonding_opts = m_bond["options"]
 
             def __write_bridged_config(self):
                 m = Network().retrieve()
diff --git a/tests/nose/network_config.py b/tests/nose/network_config.py
index 81fb50f..455885a 100644
--- a/tests/nose/network_config.py
+++ b/tests/nose/network_config.py
@@ -242,8 +242,7 @@
                                 ('ONBOOT', 'yes'), ('SLAVE', 'yes')])
 
         assert ifcfg_has_items("brbond0",
-                               [('BONDING_OPTS', 'mode=4'),
-                                ('BOOTPROTO', 'dhcp'),
+                               [('BOOTPROTO', 'dhcp'),
                                 ('DELAY', '0'),
                                 ('DEVICE', 'brbond0'),
                                 ('ONBOOT', 'yes'),


-- 
To view, visit http://gerrit.ovirt.org/16455
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b8a36c53dcd4f96ad83392c6e0be2ff8de660b9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>