diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-04-26 10:28:07 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-04-26 10:28:07 -0400 |
| commit | f3861404a08ba3171d8798facc07440284465be9 (patch) | |
| tree | c007ba761d52a95c6f3e76ae227682c2633138ff /roles/openshift_master/templates | |
| parent | 7c6d0d70e2371bd9abb6feb4e6c098ae4ddb5143 (diff) | |
| download | openshift-f3861404a08ba3171d8798facc07440284465be9.tar.gz openshift-f3861404a08ba3171d8798facc07440284465be9.tar.bz2 openshift-f3861404a08ba3171d8798facc07440284465be9.tar.xz openshift-f3861404a08ba3171d8798facc07440284465be9.zip | |
Access portal_net in common facts.
Diffstat (limited to 'roles/openshift_master/templates')
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index c70f3ec57..ad6817eb5 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -14,7 +14,7 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} {% if 'http_proxy' in openshift.common 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 }}' +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 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 549ebe5ab..80d8ef488 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 @@ -14,7 +14,7 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} {% 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 }}' +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 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 08dc87d2e..ec7b98ec3 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 @@ -14,7 +14,7 @@ AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} {% 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 }}' +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 |