diff options
| author | yfauser <yfauser@vmware.com> | 2016-10-30 22:58:38 +0100 |
|---|---|---|
| committer | yfauser <yfauser@vmware.com> | 2016-11-08 10:37:24 -0800 |
| commit | 0f10854a7d6f5a93cc9cbcc922c7157ed712df54 (patch) | |
| tree | a6f5053f70fb5052a72812110edd5beca99b3dec /roles/openshift_master/templates | |
| parent | a10e68b03db0e318e960a2f13f5f30ccb59b8d09 (diff) | |
| download | openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.tar.gz openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.tar.bz2 openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.tar.xz openshift-0f10854a7d6f5a93cc9cbcc922c7157ed712df54.zip | |
Change to allow cni deployments without openshift SDN
The roles/openshift_facts main task did not pass the cni plugin variable to the later role playbooks.
The master.yaml and node.yaml templates did not allow for a cni configuration without either installing openshift sdn or nuage.
This change will allow to use os_sdn_network_plugin_name=cni and set openshift_use_openshift_sdn=false for deployments that use a cni plugin that doesn't need and want openshift sdn to be installed
Diffstat (limited to 'roles/openshift_master/templates')
| -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 |