From: Christoph Dwertmann <christoph.dwertmann@nicta.com.au>
Date: Thu, 25 Jul 2013 07:55:02 +0000 (+1000)
Subject: Uses % instead of @ as slice/host separator for the OMF UID
X-Git-Tag: nodemanager-5.2-7~2
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=5fe3db92ad8c5aba4002a14542e915177430243b

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

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index a5f4c68..fb32834 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -23,14 +23,16 @@ def start():
 # hard-wire this for now
 # once the variables are expanded, this is expected to go into
 config_ple_template="""---
-# 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_
+
+# 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