From 24e83d00230149cb3a9a50c84889a1a0840d5567 Mon Sep 17 00:00:00 2001 From: Stefan Maute Date: Mon, 2 Jul 2018 12:44:39 +0200 Subject: [PATCH] adapt config for cluster bootstrapping Signed-off-by: Stefan Maute --- .../starter/src/main/resources/concierge-base.conf | 4 ---- .../starter/src/main/resources/connectivity.conf | 4 ---- .../gateway/starter/src/main/resources/gateway.conf | 10 +++++----- .../policies/starter/src/main/resources/policies.conf | 10 +++++----- services/things/starter/src/main/resources/things.conf | 4 +--- .../starter/src/main/resources/things-search.conf | 4 ---- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/services/concierge/starter/src/main/resources/concierge-base.conf b/services/concierge/starter/src/main/resources/concierge-base.conf index 6af7b46dc8..342e93e254 100644 --- 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 index a2efe7ae28..f96f19c9b1 100644 --- 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 index 5a962b38a7..59b90eae34 100755 --- 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 index 43bf442363..b1e5ee5353 100755 --- 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 index 02a32b7e29..46c505f86a 100755 --- 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 index dee4e735d5..e31a6f47fc 100755 --- 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} }