diff options
| author | Sanjeev Rampal <srampal@cisco.com> | 2017-02-23 12:25:34 -0800 |
|---|---|---|
| committer | Sanjeev Rampal <srampal@cisco.com> | 2017-02-27 21:04:48 -0800 |
| commit | 58818a6af147e457d56a1faf77b02d37bb538826 (patch) | |
| tree | 6f9f4faaf19ae4fbac83979048aa327849609469 /roles/openshift_node | |
| parent | c7f83e208ee433da74b7eb26644b30684a69649b (diff) | |
| download | openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.gz openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.bz2 openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.xz openshift-58818a6af147e457d56a1faf77b02d37bb538826.zip | |
Combined (squashed) commit for all changes related to adding Contiv support into Openshift Ansible. This is the first (beta) release of Contiv with Openshift and is only supported for Openshift Origin + Bare metal deployments at the time of this commit. Please refer to the Openshift and Contiv official documentation for details of the level of support for different features and modes of operation.
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 55ae4bf54..d3c3feb68 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -27,7 +27,7 @@ networkPluginName: {{ openshift.common.sdn_network_plugin_name }} # deprecates networkPluginName above. The two should match. networkConfig: mtu: {{ openshift.node.sdn_mtu }} -{% if openshift.common.use_openshift_sdn | bool or openshift.common.use_nuage | bool or openshift.common.sdn_network_plugin_name == 'cni' %} +{% if openshift.common.use_openshift_sdn | bool or openshift.common.use_nuage | bool or openshift.common.use_contiv | bool or openshift.common.sdn_network_plugin_name == 'cni' %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} {% endif %} {% if openshift.node.set_node_ip | bool %} |