X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=55315541f1cb3e4d3f8c5acd42b282424730dc70;hb=refs%2Fheads%2F1.8;hp=ed5309e9b7cf43126bef8143e5cec6f87ae09a4c;hpb=7acb378c1b5448d23bd1eb0e6583a530604d0511;p=nodemanager.git

diff --git a/nm.py b/nm.py
index ed5309e..5531554 100755
--- a/nm.py
+++ b/nm.py
@@ -85,7 +85,11 @@ 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
+    # NOTE: if an _default slice existed, it would have been found above and
+	# 		the routine would return.  Thus, if we've gotten here, then no default
+	# 		slice is bound to this node.
+    if 'OVERRIDES' in dir(config): del config.OVERRIDES
 
 
 def run():
@@ -134,6 +138,7 @@ def run():
         plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
 
         #check auth
+        logger.log("Checking Auth.")
         while plc.check_authentication() != True:
             try:
                 plc.update_session()
@@ -141,6 +146,7 @@ def run():
             except:
                 logger.log("Retry Failed.  Waiting")
             time.sleep(iperiod)
+        logger.log("Authentication Succeeded!")
 
 
         while True: