X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fomf_resctl.py;h=a5f4c687d8fb0ab4f7e7b75ba19fceae45e89357;hb=fbf0fd3367f34d39b0b562820d786d7854824ba6;hp=d5a21e97c418a6047a58347d989aca70740e9fe3;hpb=2addae8b573ec6d712c3cd508eda48d8e8b54446;p=nodemanager.git

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index d5a21e9..a5f4c68 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -13,19 +13,22 @@ import subprocess
 import tools
 import logger
 
-priority = 50
+# we need this to run after sliverauth
+priority = 150
 
 def start():
     pass
 
-### the new template for v6
+### the new template for OMF v6
 # hard-wire this for now
 # once the variables are expanded, this is expected to go into
 config_ple_template="""---
-# Example:
-# _slicename_ = nicta_ruby
-# _hostname_ = planetlab1.research.nicta.com.au
-# _xmpp_server_ = xmpp.planet-lab.eu
+# slicename = _slicename_
+# hostname = _hostname_
+# xmpp_server = _xmpp_server_
+# we extract expires time here, even in a comment so that the
+# trigger script gets called whenever this changes
+# expires: _expires_
  
 :uid: _slicename_@_hostname_
 :uri: xmpp://_slicename_-_hostname_-<%= "#{Process.pid}" %>:_slicename_-_hostname_-<%= "#{Process.pid}" %>@_xmpp_server_
@@ -41,39 +44,22 @@ config_ple_template="""---
 # the path where the config is expected from within the sliver
 yaml_slice_path="/etc/omf_rc/config.yml"
 # the path for the script that we call when a change occurs
-omf_rc_trigger_script="omf_rc_plc_trigger"
+# given that we're now responsible for fetching this one, I have to
+# decide on an actual path - not jsut a name to search for in PATH
+omf_rc_trigger_script="/usr/bin/plc_trigger_omf_rc"
 
-### this returns the kind of virtualization on the node
-# either 'vs' or 'lxc'
-# also caches it in /etc/planetlab/virt for next calls
-# could be promoted to core nm if need be
-virt_stamp="/etc/planetlab/virt"
-def get_node_virt ():
-    try:
-        return file(virt_stamp).read().strip()
-    except:
-        pass
-    logger.log("Computing virt..")
-    vs_retcod=subprocess.call ([ 'vserver', '--help' ])
-    if vs_retcod == 0:
-        virt='vs'
-    else:
-        virt='lxc'
-    with file(virt_stamp,"w") as f:
-        f.write(virt)
-    return virt
-
-def command_in_slice (slicename, argv):
-    # with vserver this can be done using vserver .. exec <trigger-script>
-    # with lxc this is less clear as we are still discussing how lxcsu should behave
-    # ideally we'd need to run lxcsu .. <trigger-script>
-    virt=get_node_virt()
-    if virt=='vs':
-        return [ 'vserver', slicename, 'exec', ] + argv
-    elif virt=='lxc':
-        return [ 'lxcsu', slicename, ] + argv
-    logger.log("command_in_slice: WARNING: could not find a valid virt")
-    return argv
+# hopefully temporary: when trigger script is missing, fetch it at the url here
+omf_rc_trigger_url="http://git.mytestbed.net/?p=omf.git;a=blob_plain;f=omf_rc/bin/plc_trigger_omf_rc;hb=HEAD"
+def fetch_trigger_script_if_missing (slicename):
+    full_path="/vservers/%s/%s"%(slicename,omf_rc_trigger_script)
+    if not os.path.isfile (full_path):
+        retcod=subprocess.call (['curl','--silent','-o',full_path,omf_rc_trigger_url])
+        if retcod!=0:
+            logger.log("Could not fetch %s"%omf_rc_trigger_url)
+        else:
+            subprocess.call(['chmod','+x',full_path])
+            logger.log("omf_resctl: fetched %s"%(full_path))
+            logger.log("omf_resctl: from %s"%(omf_rc_trigger_url))
 
 def GetSlivers(data, conf = None, plc = None):
     logger.log("omf_resctl.GetSlivers")
@@ -101,11 +87,13 @@ def GetSlivers(data, conf = None, plc = None):
         # skip non OMF-friendly slices
         if not is_omf_friendly (sliver): continue
         slicename=sliver['name']
+        expires=str(sliver['expires'])
         yaml_template = config_ple_template
         yaml_contents = yaml_template\
             .replace('_xmpp_server_',xmpp_server)\
             .replace('_slicename_',slicename)\
-            .replace('_hostname_',hostname)
+            .replace('_hostname_',hostname)\
+            .replace('_expires_',expires)
         yaml_full_path="/vservers/%s/%s"%(slicename,yaml_slice_path)
         yaml_full_dir=os.path.dirname(yaml_full_path)
         if not os.path.isdir(yaml_full_dir):
@@ -121,11 +109,11 @@ def GetSlivers(data, conf = None, plc = None):
         if config_changes or keys_changes:
             # instead of restarting the service we call a companion script
             try:
+                fetch_trigger_script_if_missing (slicename)
                 # the trigger script actually needs to be run in the slice context of course
-                # xxx we might need to use
-                # slice_command=['bash','-l','-c',omf_rc_trigger_script] 
-                slice_command = [omf_rc_trigger_script]
-                to_run = command_in_slice (slicename, slice_command)
+                slice_command = [ "sudo", "-i",  omf_rc_trigger_script ]
+                to_run = tools.command_in_slice (slicename, slice_command)
+                logger.log("command_in_slice: %s"%to_run)
                 sp=subprocess.Popen(to_run, stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
                 (out,err)=sp.communicate()
                 retcod=sp.returncode