홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Gerrit Code Review
596f2661 1 parent 004fc2c4

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

Change-Id: Ibdaad750931f0b33b84064bd3a0d52aa19a0b1a2
Inline Side-by-side
Showing 1 changed file with 5 additions and 7 deletions
...@@ -97,13 +97,11 @@ fi ...@@ -97,13 +97,11 @@ fi
97 echo "Creating local cluster configs for IP $IP..." 97 echo "Creating local cluster configs for IP $IP..."
98 [ -d $STAGE/config ] || mkdir -p $STAGE/config 98 [ -d $STAGE/config ] || mkdir -p $STAGE/config
99 cat > $STAGE/config/cluster.json <<EOF 99 cat > $STAGE/config/cluster.json <<EOF
100 - { "ipPrefix": "$SUBNET.*", 100 +{
101 - "nodes":[ { "id": "$IP", "ip": "$IP", "tcpPort": 9876 }]} 101 + "name": "default",
102 -EOF 102 + "nodes": [ {"id": "$IP", "ip": "$IP", "port": 9876 } ],
103 - 103 + "partitions": [ { "name": "p1", "members": [ "$IP" ] } ]
104 -cat > $STAGE/config/tablets.json <<EOF 104 +}
105 - { "nodes": [ { "ip": "$IP", "id": "$IP", "tcpPort": 9876 }],
106 - "partitions": { "p1": [ { "ip": "$IP", "id": "$IP", "tcpPort": 9876 }]}}
107 EOF 105 EOF
108 106
109 if [ "$CLEAN" = "true" ]; then 107 if [ "$CLEAN" = "true" ]; then
......