Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager

[nodemanager.git] / plugins / omf_resctl.py

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index c0557d5..cbea3ac 100644 (file)
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -1,8 +1,6 @@
 #
-# $Id$
-# $URL$
-#
 # NodeManager plugin - first step of handling omf_controlled slices
+#
 
 """
 Overwrites the 'resctl' tag of slivers controlled by OMF so slivermanager.py does the right thing
@@ -33,7 +31,7 @@ def GetSlivers(data, conf = None, plc = None):
     except:
         # disabled feature - bailing out
         # xxx might need to clean up more deeply..
-        logger.log("PLC_OMF_ENABLED is not set -- plugin exiting")
+        logger.log("PLC config unsufficient (not enabled, or no server set), see the PLC_OMF category -- plugin exiting")
         return
 
     # as hrn is set only at AddNode-time, upgraded myplcs might still miss this
@@ -44,12 +42,12 @@ def GetSlivers(data, conf = None, plc = None):
         if not node_hrn: raise Exception
     except:
         logger.log("Failed to read hrn from GetSlivers, using 'default' - *please upgrade PLCAPI*")
-        node_hrn='default'
+        node_hrn='default   # Failed to read hrn from GetSlivers, please upgrade PLCAPI'
 
     for sliver in data['slivers']:
         name=sliver['name']
         sliver_pub_key_dir=os.path.join("/home", name, ".ssh/")
-        sliver_private_key=os.path.join(sliver_pub_key_dir, ".ssh/id_rsa")
+        sliver_private_key=os.path.join(sliver_pub_key_dir, "id_rsa")
         for chunk in sliver['attributes']:
             if chunk['tagname']=='omf_control':
                 # scan all versions of omf-resctl