diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-04-26 16:22:42 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@afrolegs.com> | 2016-04-26 16:22:42 -0400 |
| commit | f1fb7eb8014334970a9b985daa34b6c483a42dde (patch) | |
| tree | 4ca4ce5392031bfb92baa8ef9ea10fabe8352916 | |
| parent | c934467629cdf1369c8e2a080a81dc54f154276a (diff) | |
| parent | 8bbe47fb6dfaead1eb63d94dc780e1e4c37a71d2 (diff) | |
| download | openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.tar.gz openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.tar.bz2 openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.tar.xz openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.zip | |
Merge pull request #1808 from sdodson/fix-proxy
Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY values
4 files changed, 16 insertions, 16 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 0414ff21e..e4a31c692 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -75,6 +75,7 @@ dest: /etc/sysconfig/docker regexp: '^{{ item.reg_conf_var }}=.*$' line: "{{ item.reg_conf_var }}='{{ item.reg_fact_val }}'" + state: "{{ 'present' if item.reg_fact_val != '' else 'absent'}}" with_items: - reg_conf_var: HTTP_PROXY reg_fact_val: "{{ docker_http_proxy | default('') }}" diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index ad6817eb5..4cf632841 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -11,13 +11,12 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} # Proxy configuration # See https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#configuring-global-proxy -{% if 'http_proxy' in openshift.common or 'https_proxy' in openshift.common %} +{% if 'http_proxy' in openshift.common %} HTTP_PROXY='{{ openshift.common.http_proxy | default('') }}' +{% endif %} +{% if 'https_proxy' in openshift.common %} HTTPS_PROXY='{{ openshift.common.https_proxy | default('')}}' +{% endif %} +{% if 'no_proxy' in openshift.common %} NO_PROXY='{{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }}' -{% else %} -#HTTP_PROXY=http://user:pass@proxy.example.com -#HTTPS_PROXY=http://user:pass@proxy.example.com -#NO_PROXY='.hosts.example.com' {% endif %} - diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 index 80d8ef488..01a8428a0 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 @@ -11,12 +11,12 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} # Proxy configuration # See https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#configuring-global-proxy -{% if 'http_proxy' or 'https_proxy' in openshift.common %} +{% if 'http_proxy' in openshift.common %} HTTP_PROXY='{{ openshift.common.http_proxy | default('') }}' +{% endif %} +{% if 'https_proxy' in openshift.common %} HTTPS_PROXY='{{ openshift.common.https_proxy | default('')}}' +{% endif %} +{% if 'no_proxy' in openshift.common %} NO_PROXY='{{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }}' -{% else %} -#HTTP_PROXY=http://user:pass@proxy.example.com -#HTTPS_PROXY=http://user:pass@proxy.example.com -#NO_PROXY='.hosts.example.com' {% endif %} diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 index ec7b98ec3..89ccb1eed 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 @@ -11,12 +11,12 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} # Proxy configuration # See https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#configuring-global-proxy -{% if 'http_proxy' or 'https_proxy' in openshift.common %} +{% if 'http_proxy' in openshift.common %} HTTP_PROXY='{{ openshift.common.http_proxy | default('') }}' +{% endif %} +{% if 'https_proxy' in openshift.common %} HTTPS_PROXY='{{ openshift.common.https_proxy | default('')}}' +{% endif %} +{% if 'no_proxy' in openshift.common %} NO_PROXY='{{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }}' -{% else %} -#HTTP_PROXY=http://user:pass@proxy.example.com -#HTTPS_PROXY=http://user:pass@proxy.example.com -#NO_PROXY='.hosts.example.com' {% endif %} |