diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-25 16:15:56 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-25 16:15:56 -0400 |
| commit | 7cf2ef446cde3f54d4c7095aba20e594c5747630 (patch) | |
| tree | 64e983078a369637ea18c3be10ac1115bfa4ca8c /roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 | |
| parent | 407dd1d28f06a3b66c2eeaa05a81279c7704779d (diff) | |
| parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
| download | openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.gz openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.bz2 openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.xz openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.zip | |
Merge branch 'master' into evac
Diffstat (limited to 'roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2')
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 | 15 |
1 files changed, 10 insertions, 5 deletions
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 69754ee10..549ebe5ab 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 @@ -10,8 +10,13 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} {% endif %} # Proxy configuration -# Origin uses standard HTTP_PROXY environment variables. Be sure to set -# NO_PROXY for your master -#NO_PROXY=master.example.com -#HTTP_PROXY=http://USER:PASSWORD@IPADDR:PORT -#HTTPS_PROXY=https://USER:PASSWORD@IPADDR:PORT +# 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 %} +HTTP_PROXY='{{ openshift.common.http_proxy | default('') }}' +HTTPS_PROXY='{{ openshift.common.https_proxy | default('')}}' +NO_PROXY='{{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.master.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 %} |