diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-11-16 10:55:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 10:55:08 -0500 |
| commit | d71fa60f733c987074258b6a9919d2d61ffbae5a (patch) | |
| tree | 26b6f84398fb80a1269073cec8a1a00e6017d468 /roles/openshift_master | |
| parent | 05d8ad250cc6b8ebc6d6c61f312e69e0dccf49b5 (diff) | |
| parent | 0f10854a7d6f5a93cc9cbcc922c7157ed712df54 (diff) | |
| download | openshift-d71fa60f733c987074258b6a9919d2d61ffbae5a.tar.gz openshift-d71fa60f733c987074258b6a9919d2d61ffbae5a.tar.bz2 openshift-d71fa60f733c987074258b6a9919d2d61ffbae5a.tar.xz openshift-d71fa60f733c987074258b6a9919d2d61ffbae5a.zip | |
Merge pull request #2763 from yfauser/byo_cni_plugin_fixes
[#2698] Change to allow cni deployments without openshift SDN
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 4d45e8591..169d7f2e3 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -158,7 +158,7 @@ masterPublicURL: {{ openshift.master.public_api_url }} networkConfig: clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }} hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }} -{% if openshift.common.use_openshift_sdn or openshift.common.use_nuage %} +{% if openshift.common.use_openshift_sdn or openshift.common.use_nuage or openshift.common.sdn_network_plugin_name == 'cni' %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} {% endif %} # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet |