Uses % instead of @ as slice/host separator for the OMF UID

[nodemanager.git] / plugins / omf_resctl.py

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index 5cefc2e..fb32834 100644 (file)
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -23,15 +23,16 @@ def start():
 # 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
 # we extract expires time here, even in a comment so that the
 # trigger script gets called whenever this changes
 # expires: _expires_
- 
-:uid: _slicename_@_hostname_
+
+# these are not actual OMF parameters, they are only used by the trigger script
+:hostname: _hostname_
+:slicename: _slicename_
+
+# OMF configuration
+:uid: _slicename_%_hostname_
 :uri: xmpp://_slicename_-_hostname_-<%= "#{Process.pid}" %>:_slicename_-_hostname_-<%= "#{Process.pid}" %>@_xmpp_server_
 :environment: production
 :debug: false