commit 85de40d75cf20d9d3741a812b956027e7072afb5
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jun 12 14:06:41 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Fri Jun 20 09:54:26 2014 -0700
tree cf4cc21a16ff7dbf158a96eb60684cbcfeff04fb
parent 18e0db87ff47a332d2a921a44b793966822e88b2

Configurable clustername

- Configurable clustername for ZooKeeper, Hazelcast, RAMCloud

Change-Id: I2862c7667ece21733f95b25fad3840777314170d

onos.sh

diff --git a/onos.sh b/onos.sh
index 67c1070..30a7d8a 100755
--- a/onos.sh
+++ b/onos.sh
@@ -37,6 +37,7 @@
 fi
 
 ### Variables read from ONOS config file ###
+ONOS_CLUSTER_NAME=$(read-conf ${ONOS_CONF}  onos.cluster.name             "onos")
 ONOS_HOST_NAME=$(read-conf ${ONOS_CONF}     host.name                     `hostname`)
 ONOS_HOST_IP=$(read-conf ${ONOS_CONF}       host.ip)
 ONOS_HOST_ROLE=$(read-conf ${ONOS_CONF}     host.role)
@@ -355,6 +356,8 @@
       fi
     elif [[ $line =~ __HC_PORT__ ]]; then
       echo $line | sed -e "s|__HC_PORT__|${HC_HOST_PORT}|"
+    elif [[ $line =~ __HC_CLUSTER__ ]]; then
+      echo $line | sed -e "s|__HC_CLUSTER__|${ONOS_CLUSTER_NAME}|"
     else
       echo "${line}"
     fi
@@ -370,7 +373,7 @@
 
   local temp_rc=`begin-conf-creation ${RAMCLOUD_CONF}`
 
-  local rc_cluster_name=$(read-conf ${ONOS_CONF} ramcloud.clusterName "ONOS-RC")
+  local rc_cluster_name=$(read-conf ${ONOS_CONF} ramcloud.clusterName ${ONOS_CLUSTER_NAME})
 
   # TODO make ZooKeeper address configurable.
   echo "ramcloud.locator=zk:localhost:2181" > ${temp_rc}
@@ -677,7 +680,7 @@
   local rc_locator=$(read-conf ${RAMCLOUD_CONF} ramcloud.locator "zk:localhost:2181")
 
   # RAMCloud cluster name
-  local rc_cluster_name=$(read-conf ${RAMCLOUD_CONF} ramcloud.clusterName "ONOS-RC")
+  local rc_cluster_name=$(read-conf ${RAMCLOUD_CONF} ramcloud.clusterName ${ONOS_CLUSTER_NAME})
 
   # RAMCloud transport timeout
   local rc_timeout=$(read-conf ${ONOS_CONF} ramcloud.timeout 1000)
@@ -727,7 +730,7 @@
   # Configuration for ZK address, port
   local rc_locator=$(read-conf ${RAMCLOUD_CONF} ramcloud.locator "zk:localhost:2181")
   # RAMCloud cluster name
-  local rc_cluster_name=$(read-conf ${RAMCLOUD_CONF} ramcloud.clusterName "ONOS-RC")
+  local rc_cluster_name=$(read-conf ${RAMCLOUD_CONF} ramcloud.clusterName ${ONOS_CLUSTER_NAME})
   # RAMCloud option deadServerTimeout
   # (note RC default is 250ms, setting relaxed ONOS default to 1000ms)
   local rc_coord_deadServerTimeout=$(read-conf ${ONOS_CONF} ramcloud.coordinator.deadServerTimeout 1000)
@@ -809,7 +812,7 @@
   # Configuration for ZK address, port
   local rc_locator=$(read-conf ${RAMCLOUD_CONF} ramcloud.locator "zk:localhost:2181")
   # RAMCloud cluster name
-  local rc_cluster_name=$(read-conf ${RAMCLOUD_CONF} ramcloud.clusterName "ONOS-RC")
+  local rc_cluster_name=$(read-conf ${RAMCLOUD_CONF} ramcloud.clusterName ${ONOS_CLUSTER_NAME})
   # RAMCloud transport timeout
   local rc_timeout=$(read-conf ${ONOS_CONF} ramcloud.timeout 1000)
   # replication factor (-r) config
@@ -933,6 +936,9 @@
     exit 1
     fi
 
+  # specify ZooKeeper(curator) namespace
+  JVM_OPTS="${JVM_OPTS} -Dzookeeper.namespace=${ONOS_CLUSTER_NAME}"
+
   # specify hazelcast.xml to datagrid
   JVM_OPTS="${JVM_OPTS} -Dnet.onrc.onos.core.datagrid.HazelcastDatagrid.datagridConfig=${HC_CONF}"