summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
commitdd2506e325d1a2858da353f96251f093e94bbcf3 (patch)
tree132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /roles/openshift_node
parentf004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff)
parentbf520e46e6916a4c9995ea95fa40cdd25f31209e (diff)
downloadopenshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_node')
-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 f861f04a4..97a21544d 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