Add support for using onos-form-cluster in stc setup

Change-Id: Ic35e2bbc08a5f4df6dc0a866343ccb5e6a8e891e
diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index 84b9764..b6b5a49 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -62,9 +62,11 @@
 "
 
 # 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
+if [[ -z "${ONOS_STC_FORM_START}" ]]; then
+    CDEF_FILE=/tmp/${remote}.cluster.json
+    onos-gen-partitions $CDEF_FILE
+    scp -q $CDEF_FILE $remote:$ONOS_INSTALL_DIR/config/cluster.json
+fi
 
 # Copy tools/package/config/ to remote
 scp -qr ${ONOS_ROOT}/tools/package/config/ $remote:$ONOS_INSTALL_DIR/