summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-20 15:01:56 -0400
committerGitHub <noreply@github.com>2016-09-20 15:01:56 -0400
commit8b23cf0b83273bdb4cc75c583cb2f5bbeab26e22 (patch)
treed66d84ca729a0b5e9a2e09631c7a3c6ce4b33fc9 /roles
parentbb8323195ee2607bf4766befefffa1d02e6441fa (diff)
parent72d654637a04c17ac6c8235e71744ec46ad8f329 (diff)
downloadopenshift-8b23cf0b83273bdb4cc75c583cb2f5bbeab26e22.tar.gz
openshift-8b23cf0b83273bdb4cc75c583cb2f5bbeab26e22.tar.bz2
openshift-8b23cf0b83273bdb4cc75c583cb2f5bbeab26e22.tar.xz
openshift-8b23cf0b83273bdb4cc75c583cb2f5bbeab26e22.zip
Merge pull request #2474 from sdodson/node-no-proxy-v2
Fix references to openshift.master.sdn_cluster_network_cidr in node r…
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/systemd_units.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index c20eed86e..98ef1ffd4 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -60,7 +60,7 @@
- regex: '^HTTPS_PROXY='
line: "HTTPS_PROXY={{ openshift.common.https_proxy }}"
- regex: '^NO_PROXY='
- line: "NO_PROXY={{ openshift.common.no_proxy | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }}"
+ line: "NO_PROXY={{ openshift.common.no_proxy | join(',') }},{{ openshift.common.portal_net }},{{ hostvars[groups.oo_first_master.0].openshift.master.sdn_cluster_network_cidr }}"
when: "{{ openshift.common.http_proxy is defined and openshift.common.http_proxy != '' }}"
notify:
- restart node