[incubator-openwhisk] branch master updated: Readd number of controller instances to the controller (#2596)

[ma...@apache.org]

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

markusthoemmes 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 a9ed97c  Readd number of controller instances to the controller (#2596)
a9ed97c is described below

commit a9ed97cb04dec46adba998db13862cade154bf04
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Wed Aug 9 16:21:49 2017 +0200

    Readd number of controller instances to the controller (#2596)
---
 ansible/roles/controller/tasks/deploy.yml                             | 1 +
 core/controller/src/main/scala/whisk/core/controller/Controller.scala | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
index 3f62ca9..1020d33 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -27,6 +27,7 @@
     env:
       "JAVA_OPTS": "-Xmx{{ controller.heap }}"
       "CONTROLLER_OPTS": "{{ controller.arguments }}"
+      "CONTROLLER_INSTANCES": "{{ controller.instances }}"
 
       "COMPONENT_NAME": "controller{{ groups['controllers'].index(inventory_hostname) }}"
       "PORT": 8080
diff --git a/core/controller/src/main/scala/whisk/core/controller/Controller.scala b/core/controller/src/main/scala/whisk/core/controller/Controller.scala
index 0f5236b..12a1086 100644
--- a/core/controller/src/main/scala/whisk/core/controller/Controller.scala
+++ b/core/controller/src/main/scala/whisk/core/controller/Controller.scala
@@ -157,7 +157,7 @@ object Controller {
     // a value, and whose values are default values.   A null value in the Map means there is
     // no default value specified, so it must appear in the properties file
     def requiredProperties = Map(WhiskConfig.servicePort -> 8080.toString) ++
-        Map(WhiskConfig.controllerInstances -> 1.toString) ++
+        Map(WhiskConfig.controllerInstances -> null) ++
         ExecManifest.requiredProperties ++
         RestApiCommons.requiredProperties ++
         LoadBalancerService.requiredProperties ++

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