From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 11 Jul 2013 08:22:25 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-5.2-6~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fbf0fd3367f34d39b0b562820d786d7854824ba6;hp=085710093cb21f70b982f5da3c2994bf3a2e86ac;p=nodemanager.git

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

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index 5cefc2e..a5f4c68 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -23,10 +23,9 @@ 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
+# 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_