diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-30 08:05:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 08:05:18 -0700 |
| commit | 4c773d4c3d884bb51b153249b8d7c2576e977ec1 (patch) | |
| tree | 6841572703328c6847bc70d553a3a985db11d2bd | |
| parent | 2d0365bfabc225dcb91a0df9f37ecda2bd606602 (diff) | |
| parent | 365e26214d9c3036cba2356dc02c2092de63be20 (diff) | |
| download | openshift-4c773d4c3d884bb51b153249b8d7c2576e977ec1.tar.gz openshift-4c773d4c3d884bb51b153249b8d7c2576e977ec1.tar.bz2 openshift-4c773d4c3d884bb51b153249b8d7c2576e977ec1.tar.xz openshift-4c773d4c3d884bb51b153249b8d7c2576e977ec1.zip | |
Merge pull request #5864 from JacobTanenbaum/new-CIDR
Automatic merge from submit-queue.
add new clusterNetworks fields to new installs
add clusterNetworks field to the networkConfig so that the new fields
appear in new installs
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 5 |
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 %} |