dubee closed pull request #3790: Generic plugins for deployment
URL: https://github.com/apache/incubator-openwhisk/pull/3790
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ansible/roles/controller/tasks/deploy.yml
b/ansible/roles/controller/tasks/deploy.yml
index 29dcc1b96a..82e9989543 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
@@ -238,7 +238,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"
@@ -253,7 +253,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 a5e6bb077c..bf11b5b6e7 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) }}"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
