summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorMathias Merscher <Mathias.Merscher@dg-i.net>2016-10-02 16:31:27 +0200
committerMathias Merscher <Mathias.Merscher@dg-i.net>2016-10-04 12:47:41 +0200
commit9f22136fe973f698e079925553793f0b7170552d (patch)
tree64cc0cd0d3e0b4c60351c7f4b84f77348e0cacb3 /roles/openshift_master
parenta025229edb987afb69d4799c84956821a2c56ecc (diff)
downloadopenshift-9f22136fe973f698e079925553793f0b7170552d.tar.gz
openshift-9f22136fe973f698e079925553793f0b7170552d.tar.bz2
openshift-9f22136fe973f698e079925553793f0b7170552d.tar.xz
openshift-9f22136fe973f698e079925553793f0b7170552d.zip
allow networkConfig.ingressIPNetworkCIDRs to be configured
Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
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..b4d4c7067 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 %}
+ 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 }}