summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-10-04 09:53:13 -0400
committerGitHub <noreply@github.com>2016-10-04 09:53:13 -0400
commitb31bcfb37e8740cea894eb60877d688bc3df2922 (patch)
treed8c8dfb5f98bae872bfe26ec82b0bd2e5b98e19e /roles/openshift_master
parent28f853477a3551b7518b7734e8ac80ca9c27da81 (diff)
parentcbc6a4256e6efa0c8080720c51ec254843a08677 (diff)
downloadopenshift-b31bcfb37e8740cea894eb60877d688bc3df2922.tar.gz
openshift-b31bcfb37e8740cea894eb60877d688bc3df2922.tar.bz2
openshift-b31bcfb37e8740cea894eb60877d688bc3df2922.tar.xz
openshift-b31bcfb37e8740cea894eb60877d688bc3df2922.zip
Merge pull request #2538 from DG-i/master
allow networkConfig.ingressIPNetworkCIDRs to be configured
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index ced3eb76f..4d45e8591 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -164,6 +164,9 @@ networkConfig:
# 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) }}
+{% if openshift_master_ingress_ip_network_cidr is defined %}
+ ingressIPNetworkCIDR: {{ openshift_master_ingress_ip_network_cidr }}
+{% endif %}
oauthConfig:
{% if 'oauth_always_show_provider_selection' in openshift.master %}
alwaysShowProviderSelection: {{ openshift.master.oauth_always_show_provider_selection }}