commit 19c123a77b15373973398ea2f09a5bebd97119f5
author Jordan Halterman <jordan@opennetworking.org> Mon Jul 30 13:57:19 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Jul 31 00:03:48 2018 +0000
tree 61c6fc98272ba80dffa65d2a9d05a6e5a60d030e
parent 9d445969091439f961154287c1c93e1deb5769e2

[ONOS-7757] Support onos-local and embedded cluster configurations
- Refactor cluster.json to support internal/external nodes ('controller' and 'storage')
- Bootstrap embedded partitions when 'storage' nodes not present
- Update onos-gen-config script to generate cluster.json based on environment variables
- Update setup scenario to ignore missing $OCC# environment variables

Change-Id: Ia93b64e13d7a7c35ed712da4c681425e3ccf9fe9

tools/package/onos-run-karaf

diff --git a/tools/package/onos-run-karaf b/tools/package/onos-run-karaf
index d35468a..7c7a8cc 100755
--- a/tools/package/onos-run-karaf
+++ b/tools/package/onos-run-karaf
@@ -55,7 +55,11 @@
     cat > $ONOS_DIR/config/cluster.json <<-EOF
     {
       "name": "default",
-      "cluster": [ {"id": "$IP", "ip": "$IP", "port": 9876 } ]
+      "node": {
+        "id": "$IP",
+        "ip": "$IP",
+        "port": 9876
+      }
     }
 EOF