Modified onos.sh so that Hazelcast port can be configured.
Change-Id: I0152f8361dc51899db412014058a77ff3ab5752e
Modified onos.sh to use utils.sh functions.
Fixed onos-cluster.sh potential strings bug.
Change-Id: I41dbf22801f697567658d4201b80da7917f2160f
diff --git a/conf/onos_node.conf b/conf/onos_node.conf
index 183f696..07716fd 100644
--- a/conf/onos_node.conf
+++ b/conf/onos_node.conf
@@ -46,6 +46,9 @@
# RAMCloud server option detectFailures [0=disabled] (0 by default for ONOS development)
#ramcloud.detectFailures = 0
+# Port number of Hazelcast (5701 by default)
+#hazelcast.host.port = 5701
+
# List of hostname/ip[:port] which forms Hazelcast grid
# If this value is empty, Hazelcast will be set to multicast mode.
# Inversely, if this value is set, multicast settings will be ignored.
diff --git a/conf/template/hazelcast.xml.template b/conf/template/hazelcast.xml.template
index 77db87c..b23c7e9 100644
--- a/conf/template/hazelcast.xml.template
+++ b/conf/template/hazelcast.xml.template
@@ -89,7 +89,7 @@
</topic>
<network>
- <port auto-increment="true">5701</port>
+ <port auto-increment="true">__HC_PORT__</port>
<join>
__HC_NETWORK__
<aws enabled="false">