commit 596f266186961ed460b25153ae9403f538b2ba99
author Madan Jampani <madan.jampani@gmail.com> Fri Oct 23 14:35:23 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Oct 23 21:42:22 2015 +0000
tree 7cf11b00a99e3b908f444eb77d33b5d03372f11a
parent 004fc2c4f8af8b33917028de5076c69d75da1312

Fix onos-setup-karaf to work with new cluster metadata format

Change-Id: Ibdaad750931f0b33b84064bd3a0d52aa19a0b1a2

tools/dev/bin/onos-setup-karaf

diff --git a/tools/dev/bin/onos-setup-karaf b/tools/dev/bin/onos-setup-karaf
index 3323d9d..cbe6225 100755
--- a/tools/dev/bin/onos-setup-karaf
+++ b/tools/dev/bin/onos-setup-karaf
@@ -97,13 +97,11 @@
 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
-    { "nodes": [ { "ip": "$IP", "id": "$IP", "tcpPort": 9876 }],
-      "partitions": { "p1": [ { "ip": "$IP", "id": "$IP", "tcpPort": 9876 }]}}
+{
+  "name": "default",
+  "nodes": [ {"id": "$IP", "ip": "$IP", "port": 9876 } ],
+  "partitions": [ { "name": "p1", "members": [ "$IP" ] } ]
+}
 EOF
 
 if [ "$CLEAN" = "true" ]; then