was somehow using an old config file

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