[incubator-openwhisk] branch master updated: Always disable controller.ha when only 1 controller is deployed. (#3039)

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jeremiaswerner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new a140163  Always disable controller.ha when only 1 controller is deployed. (#3039)
a140163 is described below

commit a140163da5a28bac542d7881a5101d0c8f298fbe
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Fri Dec 1 14:32:08 2017 +0100

    Always disable controller.ha when only 1 controller is deployed. (#3039)
---
 ansible/group_vars/all | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 5b2ea44..34b9d95 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -123,7 +123,7 @@ controller:
       # at this moment all controllers are seed nodes
       seedNodes: "{{ groups['controllers'] | map('extract', hostvars, 'ansible_host') | list }}"
   # We recommend to enable HA for the controllers only, if bookkeeping data are shared too. (localBookkeeping: false)
-  ha: "{{ controller_enable_ha | default(true) }}"
+  ha: "{{ controller_enable_ha | default(True) and groups['controllers'] | length > 1 }}"
 
 registry:
   confdir: "{{ config_root_dir }}/registry"
@@ -151,7 +151,7 @@ kafka:
     cacheInvalidation:
       segmentBytes: 536870912
       retentionBytes: "{{ kafka_topics_cacheInvalidation_retentionBytes | default(1073741824) }}"
-      retentionMS: "{{ kafka_topics_cacheInvalidation_retentionMS | default(300000) }}" 
+      retentionMS: "{{ kafka_topics_cacheInvalidation_retentionMS | default(300000) }}"
 
 kafka_connect_string: "{% set ret = [] %}\
                        {% for host in groups['kafkas'] %}\
@@ -351,10 +351,9 @@ logs:
 
 # Metrics Configuration
 metrics:
-  log: 
-    enabled: "{{ metrics_log | default(true) }}"    
-  kamon: 
+  log:
+    enabled: "{{ metrics_log | default(true) }}"
+  kamon:
     enabled: "{{ metrics_kamon | default(false) }}"
     host: "{{ metrics_kamon_statsd_host | default('') }}"
     port: "{{ metrics_kamon_statsd_port | default('8125') }}"
-

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].