commit 9973090927aa8a8dd0354faa46edfd9b3965a30a
author Masayoshi Kobayashi <masayoshi@onlab.us> Thu Jun 27 23:23:20 2013 -0700
committer Masayoshi Kobayashi <masayoshi@onlab.us> Thu Jun 27 23:23:20 2013 -0700
tree 7c7ffd4d9926afbdafab0141716dd89b8fe5bb51
parent 11a0c1d0e7c3b296b4324348f29994c61cf1c38e

script changes for development VM to work in multiple node environment

start-zk.sh

diff --git a/start-zk.sh b/start-zk.sh
index 206370f..0853a96 100755
--- a/start-zk.sh
+++ b/start-zk.sh
@@ -3,18 +3,19 @@
 
 ONOS_HOME=`dirname $0`
 ZK_DIR=${HOME}/zookeeper-3.4.5
-ZK_CONF=${ONOS_HOME}/conf/zoo.cfg
+#ZK_CONF=${ONOS_HOME}/conf/zoo.cfg
 
 function start {
   # Run Zookeeper with our configuration
   echo "Starting Zookeeper"
-  echo "[WARNING] This script copies conf/zoo.cfg to $ZK_DIR/conf/zoo.cfg (overwrites)"
-  echo "original zoo.cfg was backed up as zoo.cfg.backup"
-  if [ $ZK_DIR/conf/zoo.cfg ]; then
-    cp $ZK_DIR/conf/zoo.cfg $ZK_DIR/conf/zoo.cfg.backup
-  fi
-  cp $ZK_CONF $ZK_DIR/conf
-  echo "cp $ZK_CONF $ZK_DIR/conf"
+#  echo "[WARNING] This script copies conf/zoo.cfg to $ZK_DIR/conf/zoo.cfg (overwrites)"
+#  echo "original zoo.cfg was backed up as zoo.cfg.backup"
+#  if [ $ZK_DIR/conf/zoo.cfg ]; then
+#    cp $ZK_DIR/conf/zoo.cfg $ZK_DIR/conf/zoo.cfg.backup
+#  fi
+#  hostid > /var/lib/zookeeper/myid
+#  cp $ZK_CONF $ZK_DIR/conf
+#  echo "cp $ZK_CONF $ZK_DIR/conf"
   $ZK_DIR/bin/zkServer.sh start
 }
 
@@ -29,7 +30,7 @@
   done
 }
 function status {
-  $ZK_DIR/bin/zkServer.sh status $ZK_CONF
+  $ZK_DIR/bin/zkServer.sh status
 }
 
 case "$1" in