File bms-networkmanager-keep.diff of Package bms-network-config

Overview Repositories Revisions Requests Users Attributes Meta

File bms-networkmanager-keep.diff of Package bms-network-config

# Do not disable NM from controlling the bond0 interface.
# It writes the resolv.conf, thus needs full control, otherwise
# we end up with an empty resolv.conf.
# Discussion:
# It does double work, but we currently believe this is harmless.
# Other option would be to disable NM completely or to switch
# off dns handling in addition to NM_CONTROLLED=no for some interfaces.
# Risk: Dynamically provisioned interfaces don't come up without NM.
Index: bms-network-config-1.0/network_config.py.centosRedhat7
===================================================================
--- bms-network-config-1.0.orig/network_config.py.centosRedhat7
+++ bms-network-config-1.0/network_config.py.centosRedhat7
@@ -796,6 +796,7 @@ def apply_phy_hw(links, netlist):
                 if networkdic.get('link', None) == linkdic.get('id'):
                     if networkdic.get('type') == 'ipv4_dhcp':
                         ifphy_cfg['BOOTPROTO'] = 'dhcp'
+            		ifphy_cfg['NM_CONTROLLED'] = 'yes'
                         break
                     elif networkdic.get('type') == 'ipv4' and\
                             networkdic.get('netmask', None) and\
@@ -803,6 +804,7 @@ def apply_phy_hw(links, netlist):
                         ifphy_cfg['BOOTPROTO'] = 'static'
                         ifphy_cfg['NETMASk'] = networkdic.get('netmask')
                         ifphy_cfg['IPADDR'] = networkdic.get('ip_address')
+            		ifphy_cfg['NM_CONTROLLED'] = 'yes'
                         break
                 else:
                     continue
@@ -840,7 +842,7 @@ def apply_bond_hw(link_info, network_inf
             iface_cfg = {}
             bond_opts = []
             iface_cfg['BOOTPROTO'] = 'dhcp'
-            iface_cfg['NM_CONTROLLED'] = 'no'
+            iface_cfg['NM_CONTROLLED'] = 'yes'
             iface_cfg['ONBOOT'] = 'yes'
             iface_cfg['USERCTL'] = 'no'
 
@@ -853,7 +855,7 @@ def apply_bond_hw(link_info, network_inf
                     else:
                         iface_cfg['BOOTPROTO'] = 'dhcp'
                         iface_cfg['PERSISTENT_DHCLIENT'] = '1'
-                    iface_cfg['NM_CONTROLLED'] = 'no'
+                    iface_cfg['NM_CONTROLLED'] = 'yes'
                     iface_cfg['ONBOOT'] = 'yes'
                     iface_cfg['USERCTL'] = 'no'
                 else:

Places

File bms-networkmanager-keep.diff of Package bms-network-config

Places