Tagging module NodeManager - NodeManager-1.7-47

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 78c7bfa..e9ca6d6 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -56,13 +56,14 @@ def GetSlivers(plc, config):
         logger.log("Syncing w/ PLC")
         data = plc.GetSlivers()
         getPLCDefaults(data, config)
+        if (options.verbose): logger.log_slivers(data)
     except: 
         logger.log_exc()
         #  XXX So some modules can at least boostrap.
+        logger.log("nm:  Can't contact PLC to GetSlivers().  Continuing.")
         data = {}
-    if (options.verbose):
-        logger.log_slivers(data)
-    # Set i2 ip list for nodes in I2 nodegroup.
+    # Set i2 ip list for nodes in I2 nodegroup
+    # and init network interfaces (unless overridden)
     try: net.GetSlivers(plc, data, config) # TODO - num of args needs to be unified across mods.
     except: logger.log_exc()
     #  All other callback modules
@@ -84,7 +85,8 @@ def getPLCDefaults(data, config):
             if len(attr_dict):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
-            elif 'OVERRIDES' in dir(config): del config.OVERRIDES
+            return 
+    if 'OVERRIDES' in dir(config): del config.OVERRIDES
 
 
 def run():