From 19b45027fd5d1a1b2a8e149d93de693942cfb66c Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 10 Mar 2010 09:55:47 +0000 Subject: [PATCH] was somehow using an old config file --- omf-resctl.yaml.in | 92 ++++++++++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in index 9863b74..91fd392 100644 --- 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@ +# +# $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@ -- 2.43.0