diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-09-13 16:05:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 16:05:01 -0400 |
| commit | 872aafbe7a65388c473d125095ae60fc9ae915a4 (patch) | |
| tree | aed4c0327e37baf103081fe8fb52f99605860dc7 /roles/openshift_node | |
| parent | e1ce7d7b305cf5dc2cd7077a462416155fc89be7 (diff) | |
| parent | 17ebe5c355866f51df12a1a85ad35c07dbab6dad (diff) | |
| download | openshift-872aafbe7a65388c473d125095ae60fc9ae915a4.tar.gz openshift-872aafbe7a65388c473d125095ae60fc9ae915a4.tar.bz2 openshift-872aafbe7a65388c473d125095ae60fc9ae915a4.tar.xz openshift-872aafbe7a65388c473d125095ae60fc9ae915a4.zip | |
Merge pull request #2443 from sdodson/bz1375031
Define proxy settings for node services
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index 025cb567e..38dc98c07 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -48,6 +48,23 @@ notify: - restart node +- name: Configure Proxy Settings + lineinfile: + dest: /etc/sysconfig/{{ openshift.common.service_type }}-node + regexp: "{{ item.regex }}" + line: "{{ item.line }}" + create: true + with_items: + - regex: '^HTTP_PROXY=' + line: "HTTP_PROXY={{ openshift.common.http_proxy }}" + - regex: '^HTTPS_PROXY=' + line: "HTTPS_PROXY={{ openshift.common.https_proxy }}" + - regex: '^NO_PROXY=' + line: "NO_PROXY={{ openshift.common.no_proxy | join(',') }}" + when: "{{ openshift.common.http_proxy is defined and openshift.common.http_proxy != '' }}" + notify: + - restart node + - name: Reload systemd units command: systemctl daemon-reload when: openshift.common.is_containerized | bool and (install_node_result | changed or install_ovs_sysconfig | changed or install_node_dep_result | changed) |