diff options
Diffstat (limited to 'framework/src/onos/tools/test/bin/onos-config')
| -rwxr-xr-x | framework/src/onos/tools/test/bin/onos-config | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/framework/src/onos/tools/test/bin/onos-config b/framework/src/onos/tools/test/bin/onos-config index 348cb839..e37dc3b2 100755 --- a/framework/src/onos/tools/test/bin/onos-config +++ b/framework/src/onos/tools/test/bin/onos-config @@ -37,17 +37,6 @@ export ONOS_BOOT_FEATURES="${ONOS_BOOT_FEATURES:-webconsole,onos-api,onos-core,o # ONOS builtin apps and providers ignited by default export ONOS_APPS="${ONOS_APPS:-drivers,openflow}" -# Generate a cluster.json from the ON* environment variables -CDEF_FILE=/tmp/${remote}.cluster.json -echo "{ \"ipPrefix\": \"$ONOS_NIC\"," > $CDEF_FILE -echo " \"nodes\":[" >> $CDEF_FILE -for node in $(env | sort | egrep "OC[2-9]+" | cut -d= -f2); do - echo " { \"id\": \"$node\", \"ip\": \"$node\", \"tcpPort\": 9876 }," >> $CDEF_FILE -done -echo " { \"id\": \"$OC1\", \"ip\": \"$OC1\", \"tcpPort\": 9876 }" >> $CDEF_FILE -echo "]}" >> $CDEF_FILE -scp -q $CDEF_FILE $remote:$ONOS_INSTALL_DIR/config/cluster.json - ssh $remote " echo \"onos.ip = \$(sudo ifconfig | grep $ONOS_NIC | cut -d: -f2 | cut -d\\ -f1)\" \ >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/system.properties @@ -66,10 +55,10 @@ ssh $remote " done " -# Generate a default tablets.json from the ON* environment variables -TDEF_FILE=/tmp/${remote}.tablets.json -onos-gen-partitions $TDEF_FILE -scp -q $TDEF_FILE $remote:$ONOS_INSTALL_DIR/config/tablets.json +# Generate a default cluster.json from the ON* environment variables +CDEF_FILE=/tmp/${remote}.cluster.json +onos-gen-partitions $CDEF_FILE +scp -q $CDEF_FILE $remote:$ONOS_INSTALL_DIR/config/cluster.json # Copy tools/package/config/ to remote scp -qr ${ONOS_ROOT}/tools/package/config/ $remote:$ONOS_INSTALL_DIR/ |