From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 11 Jan 2017 13:28:25 +0000 (+0100)
Subject: Bug 7518: Temporarily revert the main akka.conf to netty
X-Git-Tag: release/carbon~329
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=bcb714c3684edcb0afeac1e5649fcdeec4ee7fae

Bug 7518: Temporarily revert the main akka.conf to netty

Change-Id: If31c4fc330917569b5008f2058545a8f0857a5f8
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
index 31e54601dc..9977babe35 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
@@ -3,21 +3,26 @@ odl-cluster-data {
   akka {
     remote {
       artery {
-        enabled = on
+        enabled = off
         canonical.hostname = "127.0.0.1"
         canonical.port = 2550
       }
+      netty.tcp {
+        hostname = "127.0.0.1"
+        port = 2550
+      }
     }
 
     cluster {
-      seed-nodes = ["akka://opendaylight-cluster-data@127.0.0.1:2550"]
+      # Remove ".tcp" when using artery.
+      seed-nodes = ["akka.tcp://opendaylight-cluster-data@127.0.0.1:2550"]
 
       roles = [
         "member-1"
       ]
 
     }
-    
+
     persistence {
       # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by
       # modifying the following two properties. The directory location specified may be a relative or absolute path.