Skip to content

Enable extending environment variables of Controller and Invoker #3689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csantanapr merged 11 commits into from
Jun 1, 2018
Merged

Enable extending environment variables of Controller and Invoker #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d9fa4ba
Enabled extending the env for controller and invoker
chetanmeh May 23, 2018
dd40675
Add variable for env set names
chetanmeh May 23, 2018
b96f76f
Use separate env for controller and invoker
chetanmeh May 24, 2018
2fddd87
Enabled extending the env for controller and invoker
chetanmeh May 23, 2018
4f70bce
Add variable for env set names
chetanmeh May 23, 2018
153e6f8
Use separate env for controller and invoker
chetanmeh May 24, 2018
f8787f6
have variable in global group_vars
csantanapr May 26, 2018
4117c6d
Merge remote-tracking branch 'upstream/master' into extend-env-3477
csantanapr May 26, 2018
fd35871
Merge branch 'pr-3689' into extend-env-3477
csantanapr May 26, 2018
9f3fb3e
Merge remote-tracking branch 'upstream/master' into extend-env-3477
csantanapr May 31, 2018
8fec3f5
simplify and remove when
csantanapr May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ansible/group_vars/all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ controller:
truststore:
password: "{{ controllerKeystorePassword }}"
path: "/conf/{{ controllerKeystoreName }}"
extraEnv: "{{ controller_extraEnv | default({}) }}"

# move controller protocol outside to not evaluate controller variables during execution of setup.yml
controllerProtocolForSetup: "{{ controller_protocol | default('https') }}"
controllerKeystoreName: "{{ controllerKeyPrefix }}openwhisk-keystore.p12"
Expand Down Expand Up @@ -169,6 +171,7 @@ invoker:
jvmArgs: "{% if inventory_hostname in groups['invokers'] %}
{{ jmx.jvmCommonArgs }} -Djava.rmi.server.hostname={{ invokerHostname }} -Dcom.sun.management.jmxremote.rmi.port={{ jmx.rmiBasePortInvoker + groups['invokers'].index(inventory_hostname) }} -Dcom.sun.management.jmxremote.port={{ jmx.basePortInvoker + groups['invokers'].index(inventory_hostname) }}
{% endif %}"
extraEnv: "{{ invoker_extraEnv | default({}) }}"

userLogs:
spi: "{{ userLogs_spi | default('whisk.core.containerpool.logging.DockerToActivationLogStoreProvider') }}"
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/controller/tasks/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@

"CONFIG_whisk_transactions_header": "{{ transactions.header }}"

- name: merge extra env variables
set_fact:
controller_env: "{{ controller_env | combine(controller.extraEnv) }}"

- name: include plugins
include_tasks: "{{ item }}.yml"
with_items: "{{ controller_plugins | default([]) }}"
Expand Down
12 changes: 8 additions & 4 deletions ansible/roles/invoker/tasks/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@

- name: prepare invoker env
set_fact:
env:
invoker_env:
"JAVA_OPTS": "-Xmx{{ invoker.heap }} -XX:+CrashOnOutOfMemoryError -XX:+UseGCOverheadLimit -XX:ErrorFile=/logs/java_error.log"
"INVOKER_OPTS": "{{ invoker_args | default(invoker.arguments) }}"
"JMX_REMOTE": "{{ jmx.enabled }}"
Expand Down Expand Up @@ -210,11 +210,15 @@
"CONFIG_whisk_activation_payload_max": "{{ limit_activation_payload | default() }}"
"CONFIG_whisk_transactions_header": "{{ transactions.header }}"

- name: extend invoker env
- name: extend invoker dns env
set_fact:
env: "{{ env|default({}) | combine( {'CONFIG_whisk_containerFactory_containerArgs_dnsServers_' ~ item.0: item.1} ) }}"
invoker_env: "{{ invoker_env | default({}) | combine( {'CONFIG_whisk_containerFactory_containerArgs_dnsServers_' ~ item.0: item.1} ) }}"
with_indexed_items: "{{ (invoker_container_network_dns_servers | default()).split(' ')}}"

- name: merge extra env variables
set_fact:
invoker_env: "{{ invoker_env | combine(invoker.extraEnv) }}"

- name: set invoker volumes
set_fact:
volumes: "/sys/fs/cgroup:/sys/fs/cgroup,/run/runc:/run/runc,\
Expand All @@ -239,7 +243,7 @@
image: "{{ docker_registry }}{{ docker.image.prefix }}/invoker:{{ docker.image.tag }}"
state: started
recreate: true
env: "{{ env }}"
env: "{{ invoker_env }}"
volumes: "{{ volumes }}"
ports: "{{ ports_to_expose }}"
command: /bin/sh -c "exec /init.sh {{ groups['invokers'].index(inventory_hostname) }} >> /logs/invoker{{ groups['invokers'].index(inventory_hostname) }}_logs.log 2>&1"
Expand Down