diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-19 14:13:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 14:13:49 -0400 |
| commit | 3c3459b95fefd88cc58aa4ee23661fecaea254b4 (patch) | |
| tree | 3b798004c01bbcd2097e405c068016861a0a0744 /roles/openshift_node/tasks | |
| parent | a70c9aabb910862dc78491abd97ff61169bf1199 (diff) | |
| parent | be8ada8017881f349a68759d95cf31c28ebed86d (diff) | |
| download | openshift-3c3459b95fefd88cc58aa4ee23661fecaea254b4.tar.gz openshift-3c3459b95fefd88cc58aa4ee23661fecaea254b4.tar.bz2 openshift-3c3459b95fefd88cc58aa4ee23661fecaea254b4.tar.xz openshift-3c3459b95fefd88cc58aa4ee23661fecaea254b4.zip | |
Merge pull request #2466 from sdodson/node-no-proxy-v2
Add portal_net and sdn_cluster_network_cidr to node NO_PROXY
Diffstat (limited to 'roles/openshift_node/tasks')
| -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 38dc98c07..c20eed86e 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(',') }}" + line: "NO_PROXY={{ openshift.common.no_proxy | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }}" when: "{{ openshift.common.http_proxy is defined and openshift.common.http_proxy != '' }}" notify: - restart node |