From: thierry <thierry@8c455092-636d-4788-adf5-e71def0336e8>
Date: Tue, 9 Mar 2010 08:56:47 +0000 (+0000)
Subject: refine
X-Git-Tag: omf-5.3-1~5
X-Git-Url: http://git.onelab.eu/?p=omf.git;a=commitdiff_plain;h=f7a5fd0901d33d2ec9ee5d279fd5a8d941eff779

refine
---

diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in
index 5ef54c7..770976b 100644
--- a/omf-resctl.yaml.in
+++ b/omf-resctl.yaml.in
@@ -1,4 +1,9 @@
-# This is the Config file for the Resource Controller on NICTA platforms
+#
+# $Id$
+$ $URL$
+#
+# This is the template Config file for the OMF Resource Controller
+# The uppercase symbols between '@' get filled by the Nodemanager 'omf_resctl' plugin 
 #
 ---
 :rcontroller:
@@ -8,13 +13,11 @@
    # Number of seconds between consecutive HEARTBEAT messages
    :heartbeat_interval: 10
 
-   # Interface to the control network from which this resource can be
-controlled and managed
+   # Interface to the control network from which this resource can be controlled and managed
    :control_if: control
 
    # Address of the XMPP server to use for PubSub communication
-#   :xmpp_server: @XMPP_SERVER@
-   :xmpp_server: vplc27.inria.fr
+   :xmpp_server: @XMPP_SERVER@
 
  # Agent settings
  :agent:
@@ -22,9 +25,9 @@ controlled and managed
    # Name (i.e. unique HRN ID) of this resource
    # Or this could also be passed as a command line parameter "--name"
    # Or if set to 'default', then the RC will use the output of '/bin/hostname'
-#   :name: @NODE_HRN@
-   :name: default
+   # check the node manager plugin code about this
+   # first implementation sets this to 'default'
+   :name: @NODE_HRN@
 
    # Name (i.e. unique HRN ID) of the slice to which this resource is assigned
-#   :slice: @SLICE_NAME@
-   :slice: bl_TEST
+   :slice: @SLICE_NAME@