package template yaml file, and provide a convenience, version-neutral link in /etc

diff --git a/omf-resctl.spec b/omf-resctl.spec
index 349c6c0..f0bf4b8 100644 (file)
--- a/omf-resctl.spec
+++ b/omf-resctl.spec
@@ -103,12 +103,15 @@ make libxmpp4r
 make imagezip 
 (cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
 
-# cleanup svn sequels
+# cleanup any svn sequels
 find unwrap -type d -name .svn -print0 | xargs -0 rm -rf
 
 %install
 rm -fr $RPM_BUILD_ROOT
 
+install -D -m 600 omf-resctl.yaml.in $RPM_BUILD_ROOT/etc/omf-resctl-%{version}/omf-resctl.yaml.in
+ln -s omf-resctl-%{version} $RPM_BUILD_ROOT/etc/omf-resctl 
+
 rsync -a unwrap/ $RPM_BUILD_ROOT
 
 %clean
@@ -124,10 +127,8 @@ rm -rf $RPM_BUILD_ROOT
 
 #
 %post
-mkdir /etc/omf-resctl-5.3/
-# xxx tweak config in /etc/omf-resctl-5.3/
-/sbin/chkconfig --add omf-resctl-5.3
-service omf-resctl-5.3 restart
+/sbin/chkconfig --add omf-resctl-%{version}
+service omf-resctl-%{version} restart
 
 ####################
 %files -n omf-common

diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in
new file mode 100644 (file)
index 0000000..5ef54c7
--- /dev/null
+++ b/omf-resctl.yaml.in
@@ -0,0 +1,30 @@
+# 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