diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-26 09:17:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 09:17:31 -0500 |
| commit | 824e3a669e4683c3baf94d8f9eee168bc68afcb1 (patch) | |
| tree | 67f104050de377ed852795ac1dc4b856de582f52 /roles/openshift_node | |
| parent | 7f1f05d90b4f6032629cf1a08e8f4139093f0f0b (diff) | |
| parent | cd2690c5fd83719c5abba0220c58acc584210a7f (diff) | |
| download | openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.gz openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.bz2 openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.xz openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.zip | |
Merge pull request #3182 from abutcher/no-proxy-list
Comma separate no_proxy host list in openshift_facts
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 2 |
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 626c47387..5243a87fe 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -90,7 +90,7 @@ - regex: '^HTTPS_PROXY=' line: "HTTPS_PROXY={{ openshift.common.https_proxy | default('') }}" - regex: '^NO_PROXY=' - line: "NO_PROXY={{ openshift.common.no_proxy | default([]) | join(',') }},{{ openshift.common.portal_net }},{{ hostvars[groups.oo_first_master.0].openshift.master.sdn_cluster_network_cidr }}" + line: "NO_PROXY={{ openshift.common.no_proxy | default([]) }},{{ openshift.common.portal_net }},{{ hostvars[groups.oo_first_master.0].openshift.master.sdn_cluster_network_cidr }}" when: ('http_proxy' in openshift.common and openshift.common.http_proxy != '') notify: - restart node |