From 5fe3db92ad8c5aba4002a14542e915177430243b Mon Sep 17 00:00:00 2001
From: Christoph Dwertmann <christoph.dwertmann@nicta.com.au>
Date: Thu, 25 Jul 2013 17:55:02 +1000
Subject: [PATCH] Uses % instead of @ as slice/host separator for the OMF UID

---
 plugins/omf_resctl.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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
-- 
2.43.0