Configurable clustername

- Configurable clustername for ZooKeeper, Hazelcast, RAMCloud

Change-Id: I2862c7667ece21733f95b25fad3840777314170d
diff --git a/conf/hazelcast.default.xml b/conf/hazelcast.default.xml
index b61fc9f..a65edce 100644
--- a/conf/hazelcast.default.xml
+++ b/conf/hazelcast.default.xml
@@ -3,6 +3,10 @@
 	xmlns="http://www.hazelcast.com/schema/config"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
+  <group>
+    <name>onos</name>
+  </group>
+
   <properties>
     <property name="hazelcast.logging.type">slf4j</property>
     <property name="hazelcast.version.check.enabled">false</property>
diff --git a/conf/onos_node.conf b/conf/onos_node.conf
index 5688ce1..19c6ae6 100644
--- a/conf/onos_node.conf
+++ b/conf/onos_node.conf
@@ -1,3 +1,8 @@
+
+# Name of ONOS cluster ("onos" by default)
+# used as namespace, etc. in ZooKeeper, Hazelcast, RAMCloud
+#onos.cluster.name = onos
+
 # Name of this host (`hostname` by default)
 #host.name = onosdev1
 
@@ -19,8 +24,8 @@
 # myid will be assigned incrementally according to order of list
 #zookeeper.hosts = onosdev1,onosdev2,onosdev3,onosdev4
 
-# RAMCloud clusterName (ONOS-RC by default)
-#ramcloud.clusterName = ONOS-RC
+# RAMCloud clusterName (same as onos.cluster.name by default)
+#ramcloud.clusterName = onos
 
 # RAMCloud transport timeout (1000 by ONOS default)
 #ramcloud.timeout = 1000
@@ -82,4 +87,3 @@
 
 # Multicast port used by Hazelcast. (54327 by default)
 #hazelcast.multicast.port = 54327
-
diff --git a/conf/template/hazelcast.xml.template b/conf/template/hazelcast.xml.template
index ce0e53e..0865194 100644
--- a/conf/template/hazelcast.xml.template
+++ b/conf/template/hazelcast.xml.template
@@ -9,6 +9,10 @@
       try to follow the schema defined in the xsd when possible.
   -->
 
+  <group>
+    <name>__HC_CLUSTER__</name>
+  </group>
+
   <properties>
     <property name="hazelcast.logging.type">slf4j</property>
     <property name="hazelcast.version.check.enabled">false</property>