BUG 7493: fix akka configure cluster script

Fix https://git.opendaylight.org/gerrit/#/c/49466/ caused akka not to
create/synchronize cluster in 3 nodes jobs.

Change-Id: I933589d76bf42b611f6199723dc0751f5c21fb6a
Signed-off-by: Ravit Peretz <ravit.peretz@hpe.com>

diff --git a/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh b/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh
index 7b97ef967da8789b454c939b4c30de36878601bb..864df6fbe4fb882f9d9a43a99b660dcf790db302 100755 (executable)
--- a/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh
+++ b/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh
@@ -79,8 +79,8 @@ function create_strings
     # Then merge the array using the join utility defined above.
     count=1
     for ip in ${CONTROLLERIPS[@]} ; do
-        ds[$count]=\\\"akka.tcp:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
-        rpc[$count]=\\\"akka.tcp:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
+        ds[$count]=\\\"akka:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
+        rpc[$count]=\\\"akka:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
         members[$count]=\\\"member-${count}\\\"
         count=$[count + 1]
     done

diff --git a/distribution-karaf/src/main/assembly/bin/configure_cluster.sh b/distribution-karaf/src/main/assembly/bin/configure_cluster.sh
index 5607767eed05a299abf1d45f4363638a0547196c..887f8e27a826f1110382c287ba0e7c364ee2491c 100755 (executable)
--- a/distribution-karaf/src/main/assembly/bin/configure_cluster.sh
+++ b/distribution-karaf/src/main/assembly/bin/configure_cluster.sh
@@ -76,8 +76,8 @@ function create_strings
     # Then merge the array using the join utility defined above.
     count=1
     for ip in ${CONTROLLERIPS[@]} ; do
-        ds[$count]=\\\"akka.tcp:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
-        rpc[$count]=\\\"akka.tcp:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
+        ds[$count]=\\\"akka:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
+        rpc[$count]=\\\"akka:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
         members[$count]=\\\"member-${count}\\\"
         count=$[count + 1]
     done