summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-24 12:58:51 -0400
committerGitHub <noreply@github.com>2016-08-24 12:58:51 -0400
commit1485080974da1001635b7e8e3c95ac34eeb59631 (patch)
treebf70dd93652163272316cdae34b50de2c53efc25 /roles
parentfcaeaf0ebb4f858500717f5f85aa3e27218e3e0f (diff)
parent24ea576489b37ecc5ff5fecef3cd8445ff73a4d9 (diff)
downloadopenshift-1485080974da1001635b7e8e3c95ac34eeb59631.tar.gz
openshift-1485080974da1001635b7e8e3c95ac34eeb59631.tar.bz2
openshift-1485080974da1001635b7e8e3c95ac34eeb59631.tar.xz
openshift-1485080974da1001635b7e8e3c95ac34eeb59631.zip
Merge pull request #2100 from smunilla/BZ1337553
Add externalIPNetworkCIDRs to config
Diffstat (limited to 'roles')
-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 e9beed3b3..0683fa95a 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 }}