set NM_CONTROLLED='no'

[pyplnet.git] / plnet.py

diff --git a/plnet.py b/plnet.py
index 00b343f..75a7eab 100755 (executable)
--- a/plnet.py
+++ b/plnet.py
@@ -19,14 +19,15 @@ def ovs_check(logger):
         it once.
     """
     rc = os.system("service openvswitch status")
-    if rc!=0:
-        logger.log("net: restarting openvswitch")
-        rc = os.system("service openvswitch restart")
+    if rc == 0:
+        return True
+    logger.log("net: restarting openvswitch")
+    rc = os.system("service openvswitch restart")
     rc = os.system("service openvswitch status")
-    if rc!=0:
-        logger.log("net: failed to restart openvswitch")
-        return False
-    return True
+    if rc == 0:
+        return True
+    logger.log("net: failed to restart openvswitch")
+    return False
 
 def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
     global version
@@ -472,6 +473,8 @@ def prepDetails(interface, hostname=''):
     details = {}
     details['ONBOOT']  = 'yes'
     details['USERCTL'] = 'no'
+    # attempt to work around issues seen starting with f23
+    details['NM_CONTROLLED'] = 'no'
     if interface['mac']:
         details['HWADDR'] = interface['mac']
     if interface['is_primary']: