summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-26 14:48:21 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-26 14:48:21 -0400
commitc934467629cdf1369c8e2a080a81dc54f154276a (patch)
tree461895fc3d36e733feebf8a0aeb08344e115dd95 /roles/openshift_master
parent2833d9a86a0e8dddc1cfb0c481d341498da0e0c1 (diff)
parent927278059ae25e97ada2161903c571409c2bc151 (diff)
downloadopenshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.gz
openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.bz2
openshift-c934467629cdf1369c8e2a080a81dc54f154276a.tar.xz
openshift-c934467629cdf1369c8e2a080a81dc54f154276a.zip
Merge pull request #1809 from abutcher/portal-net
BZ 1330357: Fail to deploy pod after installing env with openshift_master_portal_net='172.31.0.0/16'
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/atomic-openshift-master.j22
-rw-r--r--roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j22
-rw-r--r--roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j22
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