summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-06-29 14:01:24 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-23 14:19:01 -0400
commit24ea576489b37ecc5ff5fecef3cd8445ff73a4d9 (patch)
treef38391c3704cb8e87bbc8c617ac7b59df73c7a62 /roles/openshift_master
parent7435ce713bbd3018192e3b7287ccfc5bf967e290 (diff)
downloadopenshift-24ea576489b37ecc5ff5fecef3cd8445ff73a4d9.tar.gz
openshift-24ea576489b37ecc5ff5fecef3cd8445ff73a4d9.tar.bz2
openshift-24ea576489b37ecc5ff5fecef3cd8445ff73a4d9.tar.xz
openshift-24ea576489b37ecc5ff5fecef3cd8445ff73a4d9.zip
Add externalIPNetworkCIDRs to config
Allow networkConfig.externalIPNetworkCIDRs to be set along with a default to emulate the old 3.1 behavior.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 31e86f5bd..bb5175261 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -156,6 +156,7 @@ networkConfig:
{% endif %}
# serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet
serviceNetworkCIDR: {{ openshift.common.portal_net }}
+ externalIPNetworkCIDRs: {{ openshift_master_external_ip_network_cidrs | default(["0.0.0.0/0"]) | to_padded_yaml(1,2) }}
oauthConfig:
{% if 'oauth_always_show_provider_selection' in openshift.master %}
alwaysShowProviderSelection: {{ openshift.master.oauth_always_show_provider_selection }}