From 24ea576489b37ecc5ff5fecef3cd8445ff73a4d9 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 29 Jun 2016 14:01:24 -0400 Subject: Add externalIPNetworkCIDRs to config Allow networkConfig.externalIPNetworkCIDRs to be set along with a default to emulate the old 3.1 behavior. --- roles/openshift_master/templates/master.yaml.v1.j2 | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_master') 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 }} -- cgit v1.2.3