QPID-3603: Install scripts and configuration for qpid HA rgmanager integration.

qpid/bin/install-cpp-python: installs c++ and python builds.
qpid/cpp/etc/Makefile.am: installs init.d scripts.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1305851 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 22 insertions, 22 deletions

diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am
index ab7c62d95d..183c600f96 100644
--- a/qpid/cpp/etc/Makefile.am
+++ b/qpid/cpp/etc/Makefile.am
@@ -34,3 +34,6 @@ nobase_sysconf_DATA += \
 	$(SASL_CONF)
 
 endif
+
+initddir = $(sysconfdir)/init.d
+nobase_initd_SCRIPTS = qpidd qpidd-primary
diff --git a/qpid/cpp/etc/cluster.conf-example.xml b/qpid/cpp/etc/cluster.conf-example.xml
index 555843fd8e..d1a0fad01d 100644
--- a/qpid/cpp/etc/cluster.conf-example.xml
+++ b/qpid/cpp/etc/cluster.conf-example.xml
@@ -1,48 +1,45 @@
 <?xml version="1.0"?>
 <!--
-This is an example of a cluster.conf file to run qpidd under rgmanager.
-This example assumes a 3 node cluster, with nodes named mrg32, mrg34 and mrg35.
-There is no fencing in this configuration.
+This is an example of a cluster.conf file to run qpidd HA under rgmanager.
+This example assumes a 3 node cluster, with nodes named node1, node2 and node3.
 -->
 
-<cluster alias="qpid-hot-standby" config_version="4" name="qpid-hot-standby">
+<cluster name="qpid-test" config_version="4">
   <!-- The cluster has 3 nodes. Each has a unique nodid and one vote for quorum. -->
   <clusternodes>
-    <clusternode name="mrg32" nodeid="1">
+    <clusternode name="node1" nodeid="1">
       <fence/>
     </clusternode>
-    <clusternode name="mrg34" nodeid="2">
+    <clusternode name="node2" nodeid="2">
       <fence/>
     </clusternode>
-    <clusternode name="mrg35" nodeid="3">
+    <clusternode name="node3" nodeid="3">
       <fence/>
     </clusternode>
   </clusternodes>
-  <cman/>
-  <!-- Optionally you can specify logging, this is the most verbose -->
-  <rm log_level="7" log_facility="daemon">
-
+  <!-- Resouce Manager configuration. -->
+  <rm log_level="7">		<!-- Optional logging -->
     <!--
 	There is a failoverdomain for each node containing just that node.
 	This lets us stipulate that the qpidd service should always run on all nodes.
     -->
     <failoverdomains>
-      <failoverdomain name="mrg32-domain" restricted="1">
-	<failoverdomainnode name="mrg32"/>
+      <failoverdomain name="node1-domain" restricted="1">
+	<failoverdomainnode name="node1"/>
       </failoverdomain>
-      <failoverdomain name="mrg34-domain" restricted="1">
-	<failoverdomainnode name="mrg34"/>
+      <failoverdomain name="node2-domain" restricted="1">
+	<failoverdomainnode name="node2"/>
       </failoverdomain>
-      <failoverdomain name="mrg35-domain" restricted="1">
-	<failoverdomainnode name="mrg35"/>
+      <failoverdomain name="node3-domain" restricted="1">
+	<failoverdomainnode name="node3"/>
       </failoverdomain>
     </failoverdomains>
 
     <resources>
-      <!-- This script starts a qpidd broker acting as a backup. -->
+      <!-- This script starts a qpidd broker initially acting as a backup. -->
       <script file="/etc/init.d/qpidd" name="qpidd"/>
 
-      <!-- This script promotes the qpidd broker on this node to primary. -->
+      <!-- This script promotes the qpidd broker to primary. -->
       <script file="/etc/init.d/qpidd-primary" name="qpidd-primary"/>
 
       <!-- This is a virtual IP address for broker replication traffic. -->
@@ -53,13 +50,13 @@ There is no fencing in this configuration.
     </resources>
 
     <!-- There is a qpidd service on each node, it should be restarted if it fails. -->
-    <service name="mrg32-qpidd-service" domain="mrg32-domain" recovery="restart">
+    <service name="node1-qpidd-service" domain="node1-domain" recovery="restart">
       <script ref="qpidd"/>
     </service>
-    <service name="mrg34-qpidd-service" domain="mrg34-domain" recovery="restart">
+    <service name="node2-qpidd-service" domain="node2-domain" recovery="restart">
       <script ref="qpidd"/>
     </service>
-    <service name="mrg35-qpidd-service" domain="mrg35-domain"  recovery="restart">
+    <service name="node3-qpidd-service" domain="node3-domain"  recovery="restart">
       <script ref="qpidd"/>
     </service>