diff options
| author |   Dan Sneddon <dsneddon@redhat.com> | 2015-05-14 10:58:10 -0700 |
|---|---|---|
| committer | Dan Sneddon <dsneddon@redhat.com> | 2015-05-14 11:17:05 -0700 |
| commit | afcd514b7cb4b9a465c615c0a16d7f6af2a1d0ed (patch) | |
| tree | 64e9ac9b7560926c84e22bcdff47cf93879e8ad7 | |
| parent | b0536cb24b35d99f59762c38cd8ba02e3038f94b (diff) | |
Add NM_CONTROLLED=no to each interface configuration
In order to allow os-net-config to coexist with NetworkManager, this
patch adds NM_CONTROLLED=no to the top of each interface configuration.
This ensures that NetworkManager will not mess with interfaces that are
configured by os-net-config.
Change-Id: I9d226e032eb1cb411b6ea617936f4425c7fd2c74
| -rw-r--r-- | os_net_config/impl_ifcfg.py | 1 | ||||
| -rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py index e5f39b6..097552a 100644 --- a/os_net_config/impl_ifcfg.py +++ b/os_net_config/impl_ifcfg.py @@ -72,6 +72,7 @@ class IfcfgNetConfig(os_net_config.NetConfig): data += "DEVICE=%s\n" % base_opt.name data += "ONBOOT=yes\n" data += "HOTPLUG=no\n" + data += "NM_CONTROLLED=no\n" if isinstance(base_opt, objects.Vlan): data += "VLAN=yes\n" if base_opt.device: diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index 5c733d8..f43faed 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -29,6 +29,7 @@ _BASE_IFCFG = """# This file is autogenerated by os-net-config DEVICE=em1 ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no """ _NO_IP = _BASE_IFCFG + "BOOTPROTO=none\n" @@ -65,6 +66,7 @@ _OVS_BRIDGE_DHCP = """# This file is autogenerated by os-net-config DEVICE=br-ctlplane ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=dhcp @@ -84,6 +86,7 @@ _BASE_VLAN = """# This file is autogenerated by os-net-config DEVICE=vlan5 ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no VLAN=yes PHYSDEV=em1 """ @@ -107,6 +110,7 @@ _OVS_BOND_DHCP = """# This file is autogenerated by os-net-config DEVICE=bond0 ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no DEVICETYPE=ovs TYPE=OVSBond OVSBOOTPROTO=dhcp @@ -254,6 +258,7 @@ class TestIfcfgNetConfig(base.TestCase): DEVICE=em2 ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no BOOTPROTO=none """ self.assertEqual(em2_config, self.get_interface_config('em2')) @@ -269,12 +274,14 @@ BOOTPROTO=none DEVICE=em1 ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no BOOTPROTO=none """ em2_config = """# This file is autogenerated by os-net-config DEVICE=em2 ONBOOT=yes HOTPLUG=no +NM_CONTROLLED=no BOOTPROTO=none DEFROUTE=no """ |