[incubator-openwhisk] branch master updated: Make controller environment variable name generic (#3790)

[du...@apache.org]

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

dubeejw 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 d4757f8  Make controller environment variable name generic (#3790)
d4757f8 is described below

commit d4757f8ece830cbcd45b7424a394515bd7c49416
Author: James Dubee <jw...@us.ibm.com>
AuthorDate: Fri Jul 6 13:39:39 2018 -0400

    Make controller environment variable name generic (#3790)
---
 ansible/roles/controller/tasks/deploy.yml            | 6 +++---
 ansible/roles/controller/tasks/join_akka_cluster.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
index 8d18931..8201821 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -109,7 +109,7 @@
 
 - name: populate environment variables for controller
   set_fact:
-    controller_env:
+    env:
       "JAVA_OPTS":
         -Xmx{{ controller.heap }}
         -XX:+CrashOnOutOfMemoryError
@@ -237,7 +237,7 @@
 
 - name: merge extra env variables
   set_fact:
-    controller_env: "{{ controller_env | combine(controller.extraEnv) }}"
+    env: "{{ env | combine(controller.extraEnv) }}"
 
 - name: include plugins
   include_tasks: "{{ item }}.yml"
@@ -252,7 +252,7 @@
     recreate: true
     restart_policy: "{{ docker.restart.policy }}"
     hostname: "{{ controller_name }}"
-    env: "{{ controller_env }}"
+    env: "{{ env }}"
     volumes:
       - "{{ whisk_logs_dir }}/{{ controller_name }}:/logs"
       - "{{ controller.confdir }}/{{ controller_name }}:/conf"
diff --git a/ansible/roles/controller/tasks/join_akka_cluster.yml b/ansible/roles/controller/tasks/join_akka_cluster.yml
index a5e6bb0..bf11b5b 100644
--- a/ansible/roles/controller/tasks/join_akka_cluster.yml
+++ b/ansible/roles/controller/tasks/join_akka_cluster.yml
@@ -15,8 +15,8 @@
 
 - name: add seed nodes to controller environment
   set_fact:
-    controller_env: >-
-      {{ controller_env | combine({
+    env: >-
+      {{ env | combine({
         'CONFIG_akka_cluster_seedNodes_' ~ item.0:
           'akka.tcp://controller-actor-system@'~item.1~':'~(controller.akka.cluster.basePort+item.0)
       }) }}
@@ -33,4 +33,4 @@
       "CONFIG_akka_remote_netty_tcp_bindPort":
         "{{ controller.akka.cluster.bindPort }}"
   set_fact:
-    controller_env: "{{ controller_env | combine(akka_env) }}"
+    env: "{{ env | combine(akka_env) }}"