summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorJacob Tanenbaum <jtanenba@redhat.com>2017-10-24 14:01:28 -0400
committerJacob Tanenbaum <jtanenba@redhat.com>2017-10-27 13:53:20 -0400
commit365e26214d9c3036cba2356dc02c2092de63be20 (patch)
tree79cbbff26ae46247978cfc53832704741b636331 /roles/openshift_master
parentd9cfebd1196815542c945e3f217581bbbfc61eaa (diff)
downloadopenshift-365e26214d9c3036cba2356dc02c2092de63be20.tar.gz
openshift-365e26214d9c3036cba2356dc02c2092de63be20.tar.bz2
openshift-365e26214d9c3036cba2356dc02c2092de63be20.tar.xz
openshift-365e26214d9c3036cba2356dc02c2092de63be20.zip
add new clusterNetworks fields to new installs
add clusterNetworks field to the networkConfig so that the new fields appear in new installs when openshift version is greater then 3.7
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 40775571f..a1a0bfaa9 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -179,6 +179,11 @@ masterPublicURL: {{ openshift.master.public_api_url }}
networkConfig:
clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }}
hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}
+{% if openshift.common.version_gte_3_7 | bool %}
+ clusterNetworks:
+ - cidr: {{ openshift.master.sdn_cluster_network_cidr }}
+ hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}
+{% endif %}
{% if r_openshift_master_use_openshift_sdn or r_openshift_master_use_nuage or r_openshift_master_use_contiv or r_openshift_master_use_kuryr or r_openshift_master_sdn_network_plugin_name == 'cni' %}
networkPluginName: {{ r_openshift_master_sdn_network_plugin_name_default }}
{% endif %}