commit 9b171c5d97b5bd8449f907b4ffa8def25fd14ccc
author Thomas Vachuska <tom@onlab.us> Tue Apr 28 12:01:07 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Apr 28 21:39:36 2015 +0000
tree 5cf26326bcace21927d8821d16fee89b795b2eaa
parent b35ed3691826271040b10b259f7f983d87d91bb3

Fixing onos-setup-karaf to always generate tablets.json and cluster.json config files without having to specify 'clean' option.

Change-Id: I23b4d86fb5bdfd5e93a0d7fa8e18de8ecdbc2bee

tools/test/bin/onos-setup-karaf

diff --git a/tools/test/bin/onos-setup-karaf b/tools/test/bin/onos-setup-karaf
index e0886cf..9cf4318 100755
--- a/tools/test/bin/onos-setup-karaf
+++ b/tools/test/bin/onos-setup-karaf
@@ -94,19 +94,17 @@
         $KARAF_ROOT/lib
 fi
 
-if [ ! -d $STAGE/config ]; then
-    echo "Creating local cluster configs for IP $IP..."
-    mkdir -p $STAGE/config
-    cat > $STAGE/config/cluster.json <<EOF
+echo "Creating local cluster configs for IP $IP..."
+[ -d $STAGE/config ] || mkdir -p $STAGE/config
+cat > $STAGE/config/cluster.json <<EOF
     { "ipPrefix": "$SUBNET.*",
       "nodes":[ { "id": "$IP", "ip": "$IP", "tcpPort": 9876 }]}
 EOF
 
-    cat > $STAGE/config/tablets.json <<EOF
+cat > $STAGE/config/tablets.json <<EOF
     { "nodes": [ { "ip": "$IP", "id": "$IP", "tcpPort": 7238 }],
       "partitions": { "p1": [ { "ip": "$IP", "id": "$IP", "tcpPort": 7238 }]}}
 EOF
-fi
 
 echo "Setting up hazelcast.xml for subnet $SUBNET.*..."
 cp $ONOS_ROOT/tools/package/etc/hazelcast.xml $KARAF_ROOT/etc/hazelcast.xml