From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Thu, 8 Jul 2010 11:01:50 +0000 (+0200)
Subject: add sliver keys to resctl configuration
X-Git-Tag: nodemanager-2.0-16~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=0780681656c26ddc04b7987db9d1c21c66160395;p=nodemanager.git

add sliver keys to resctl configuration
---

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index 4fd2e8e..5c69ff0 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -43,6 +43,8 @@ def GetSlivers(data, conf = None, plc = None):
 
     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")
         for chunk in sliver['attributes']:
             if chunk['tagname']=='omf_control':
                 # scan all versions of omf-resctl
@@ -63,7 +65,9 @@ def GetSlivers(data, conf = None, plc = None):
                     yaml_contents=template_contents\
                         .replace('@XMPP_SERVER@',xmpp_server)\
                         .replace('@NODE_HRN@',node_hrn)\
-                        .replace('@SLICE_NAME@',name)
+                        .replace('@SLICE_NAME@',name)\
+                        .replace('@SLIVER_PRIVATE_KEY@',sliver_private_key)\
+                        .replace('@SLIVER_PUB_KEY_DIR@',sliver_pub_key_dir)
                     changes=tools.replace_file_with_string(yaml,yaml_contents)
                     if changes:
                         sp=subprocess.Popen(['vserver',name,'exec','service',service_name,'restart'],