X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=omf-resctl.yaml.in;h=91fd392fa9e554ec26d54cd3e5d06379ce0bc89b;hb=c19ba92bd46ad61fe05904253efe8220b431ce3a;hp=5ef54c7955b6aba85348d01eb44e865371b06b17;hpb=8298be0fa3c5db5ae09d0d351304cad2da194385;p=omf.git

diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in
index 5ef54c7..91fd392 100644
--- a/omf-resctl.yaml.in
+++ b/omf-resctl.yaml.in
@@ -1,30 +1,60 @@
-# This is the Config file for the Resource Controller on NICTA platforms
-#
----
-:rcontroller:
- # Communication settings
- :comm:
-
-   # Number of seconds between consecutive HEARTBEAT messages
-   :heartbeat_interval: 10
-
-   # 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
-
- # Agent settings
- :agent:
-
-   # 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
-
-   # Name (i.e. unique HRN ID) of the slice to which this resource is assigned
-#   :slice: @SLICE_NAME@
-   :slice: bl_TEST
+#
+# $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 
+#
+# Copyright (c) 2006-2009 National ICT Australia (NICTA), Australia
+#
+# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+#
+# NOTE: use only 'spaces' to indent !
+# ('tab' indents are not supported by the ruby yaml parser used to read this file)
+#
+---
+:rcontroller:
+  # Communication settings 
+  :comm:
+
+    # Number of seconds between consecutive HEARTBEAT messages
+    :heartbeat_interval: 10
+  
+    # Interface to the control network from which this resource can be controlled and managed
+    :control_if: control
+
+    # Address of the local PubSub server to use for PubSub communication
+    :local_pubsub_server: @XMPP_SERVER@
+
+    # Address of the remote PubSub server which host the PubSub groups for my Slice
+    :remote_pubsub_server: @XMPP_SERVER@
+
+  # Agent settings
+  :agent:
+
+    # 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 (i.e. unique HRN ID) of the slice to which this resource is assigned
+    :slice: @SLICE_NAME@