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

diff --combined plugins/omf_resctl.py
index 5cefc2e,13fa192..a5f4c68
--- 1/plugins/omf_resctl.py
--- 2/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@@ -13,8 -13,7 +13,8 @@@ import subproces
  import tools
  import logger
  
 -priority = 50
 +# we need this to run after sliverauth
 +priority = 150
  
  def start():
      pass
@@@ -23,10 -22,9 +23,9 @@@
  # 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_