adapt config for cluster bootstrapping

Signed-off-by: Stefan Maute <stefan.maute@bosch-si.com>
eclipse-ditto · Jul 2, 2018 · 24e83d0 · 24e83d0
1 parent 1c9d6a9
commit 24e83d0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 25 deletions.
diff --git a/services/concierge/starter/src/main/resources/concierge-base.conf b/services/concierge/starter/src/main/resources/concierge-base.conf
@@ -133,10 +133,6 @@ akka {
         service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE}
         effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME}
 
-        stable-margin = 5 seconds
-
-        // TODO only for testing
-        required-contact-point-nr = 1 // minimun number of nodes to bootstrap the cluster
         required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS}
       }
 

diff --git a/services/connectivity/starter/src/main/resources/connectivity.conf b/services/connectivity/starter/src/main/resources/connectivity.conf
@@ -151,10 +151,6 @@ akka {
         service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE}
         effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME}
 
-        stable-margin = 5 seconds
-
-        // TODO only for testing
-        required-contact-point-nr = 1 // minimun number of nodes to bootstrap the cluster
         required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS}
       }
 

diff --git a/services/gateway/starter/src/main/resources/gateway.conf b/services/gateway/starter/src/main/resources/gateway.conf
@@ -198,12 +198,12 @@ akka {
     cluster.bootstrap {
 
       contact-point-discovery {
-        service-name = "policies"
-        service-namespace = "default.svc.cluster.local"
-        stable-margin = 5 seconds
+        service-name = "ditto-cluster"
+        service-name = ${?CLUSTER_BS_SERVICE_NAME}
+        service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE}
+        effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME}
 
-        required-contact-point-nr = 1 // minimun number of nodes to bootstrap the cluster
-        required-contact-point-nr = ${?REQUIRED_CONTACT_POINTS}
+        required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS}
       }
 
       contact-point {

diff --git a/services/policies/starter/src/main/resources/policies.conf b/services/policies/starter/src/main/resources/policies.conf
@@ -143,12 +143,12 @@ akka {
     cluster.bootstrap {
 
       contact-point-discovery {
-        service-name = "policies"
-        service-namespace = "default.svc.cluster.local"
-        stable-margin = 5 seconds
+        service-name = "ditto-cluster"
+        service-name = ${?CLUSTER_BS_SERVICE_NAME}
+        service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE}
+        effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME}
 
-        required-contact-point-nr = 1 // minimun number of nodes to bootstrap the cluster
-        required-contact-point-nr = ${?REQUIRED_CONTACT_POINTS}
+        required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS}
       }
 
       contact-point {

diff --git a/services/things/starter/src/main/resources/things.conf b/services/things/starter/src/main/resources/things.conf
@@ -148,10 +148,8 @@ akka {
         service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE}
         effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME}
 
-        stable-margin = 5 seconds
+        # stable-margin = 10 seconds
 
-        // TODO only for testing
-        required-contact-point-nr = 1 // minimun number of nodes to bootstrap the cluster
         required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS}
       }
 

diff --git a/services/thingsearch/starter/src/main/resources/things-search.conf b/services/thingsearch/starter/src/main/resources/things-search.conf
@@ -198,10 +198,6 @@ akka {
         service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE}
         effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME}
 
-        stable-margin = 5 seconds
-
-        // TODO only for testing
-        required-contact-point-nr = 1 // minimun number of nodes to bootstrap the cluster
         required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS}
       }