summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-06-23 10:42:08 -0400
committerGitHub <noreply@github.com>2016-06-23 10:42:08 -0400
commitf049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d (patch)
tree6064ca09aacd92cc8bf96fd34b7b7702cc23d2e3 /roles/openshift_node/tasks
parent3daab87371094b941f6511cd889e179357463e87 (diff)
parent9193a58d129716601091b2f3ceb7ca3960a694cb (diff)
downloadopenshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.tar.gz
openshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.tar.bz2
openshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.tar.xz
openshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.zip
Merge pull request #2025 from abutcher/global-env
Per-service environment variables
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml11
1 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 6aac0dc21..165010afb 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -26,6 +26,7 @@
proxy_mode: "{{ openshift_node_proxy_mode | default('iptables') }}"
local_quota_per_fsgroup: "{{ openshift_node_local_quota_per_fsgroup | default(None) }}"
dns_ip: "{{ openshift_dns_ip | default(none) | get_dns_ip(hostvars[inventory_hostname])}}"
+ env_vars: "{{ openshift_node_env_vars | default(None) }}"
# We have to add tuned-profiles in the same transaction otherwise we run into depsolving
# problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging.
@@ -91,6 +92,16 @@
notify:
- restart node
+- name: Configure Node Environment Variables
+ lineinfile:
+ dest: /etc/sysconfig/{{ openshift.common.service_type }}-node
+ regexp: "^{{ item.key }}="
+ line: "{{ item.key }}={{ item.value }}"
+ create: true
+ with_dict: "{{ openshift.node.env_vars | default({}) }}"
+ notify:
+ - restart node
+
- name: Additional storage plugin configuration
include: storage_plugins/main.yml