From afcd514b7cb4b9a465c615c0a16d7f6af2a1d0ed Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Thu, 14 May 2015 10:58:10 -0700 Subject: 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 --- os_net_config/tests/test_impl_ifcfg.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'os_net_config/tests/test_impl_ifcfg.py') 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 """ -- cgit 1.2.3-korg