diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-25 15:31:53 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-25 15:31:53 -0500 |
commit | 4a2e65e5500eced93722ae6b39c7994a270563d2 (patch) | |
tree | 18ca3afb811b695b381afbe303b0c23221fd11a4 /roles/openshift_node/templates | |
parent | 5b188705f2e54da54ae64ac40ad133619e3e0d02 (diff) | |
parent | 93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5 (diff) | |
download | openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.tar.gz openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.tar.bz2 openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.tar.xz openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.zip |
Merge pull request #1160 from vishpat/nuage
Nuage
Diffstat (limited to 'roles/openshift_node/templates')
-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 cbe811f83..44065f4bd 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -20,7 +20,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 %} +{% if openshift.common.use_openshift_sdn or openshift.common.use_nuage %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} {% endif %} {% if openshift.node.set_node_ip | bool %} |