import tools
import logger
-priority = 50
+# we need this to run after sliverauth
+priority = 150
def start():
- logger.log("omf_resctl: plugin starting up...")
+ 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="""---
# _slicename_ = nicta_ruby
# _hostname_ = planetlab1.research.nicta.com.au
# _xmpp_server_ = xmpp.planet-lab.eu
+# 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_
# 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="/some/path/to/the/change/script"
+# 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"
+
+# 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")
if 'accounts' not in data:
logger.log_missing_data("omf_resctl.GetSlivers",'accounts')
return
raise Exception
except:
# disabled feature - bailing out
- # xxx might need to clean up more deeply..
- logger.log("PLC config unsufficient (not enabled, or no server set), see the PLC_OMF category -- plugin exiting")
+ logger.log("omf_resctl: PLC_OMF config unsufficient (not enabled, or no server set), -- plugin exiting")
return
hostname = data['hostname']
# 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 isdir(yaml_full_dir):
+ if not os.path.isdir(yaml_full_dir):
try: os.makedirs(yaml_full_dir)
except OSError: pass
- changes=tools.replace_file_with_string(yaml_full_path,yaml_contents)
- logger.log("yaml_contents length=%d, changes=%r"%(len(yaml_contents),changes))
- if changes:
+ config_changes=tools.replace_file_with_string(yaml_full_path,yaml_contents)
+ logger.log("yaml_contents length=%d, config_changes=%r"%(len(yaml_contents),config_changes))
+ # would make sense to also check for changes to authorized_keys
+ # would require saving a copy of that some place for comparison
+ # xxx todo
+ keys_changes = False
+ if config_changes or keys_changes:
# instead of restarting the service we call a companion script
- sp=subprocess.Popen([omf_rc_trigger_script],
- stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
- (output,retcod)=sp.communicate()
- logger.log("omf_resctl: %s: called OMF rc control script (retcod=%r)"%(slicename,retcod))
- logger.log("omf_resctl: got output\n%s"%output)
+ try:
+ fetch_trigger_script_if_missing (slicename)
+ # the trigger script actually needs to be run in the slice context of course
+ 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
+ # we don't wait for that, try to display a retcod for info purpose only
+ # might be None if that config script lasts or hangs whatever
+ logger.log("omf_resctl: %s: called OMF rc control script (imm. retcod=%r)"%(slicename,retcod))
+ logger.log("omf_resctl: got stdout\n%s"%out)
+ logger.log("omf_resctl: got stderr\n%s"%err)
+ except:
+ import traceback
+ traceback.print_exc()
+ logger.log_exc("omf_resctl: WARNING: Could not call trigger script %s"%\
+ omf_rc_trigger_script, name=slicename)
else:
logger.log("omf_resctl: %s: omf_control'ed sliver has no change" % slicename)
git://git.onelab.eu / nodemanager.git / blobdiff