summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-31 22:07:23 -0400
committerScott Dodson <sdodson@redhat.com>2016-08-31 22:07:23 -0400
commit9956728a72fc80a789f54c40a761936203169bdf (patch)
tree2d77c7a47e35a38c155a8319ede04d2254c28487
parent669f1e2de707f199d90c5709c6408604b20b0df7 (diff)
downloadopenshift-9956728a72fc80a789f54c40a761936203169bdf.tar.gz
openshift-9956728a72fc80a789f54c40a761936203169bdf.tar.bz2
openshift-9956728a72fc80a789f54c40a761936203169bdf.tar.xz
openshift-9956728a72fc80a789f54c40a761936203169bdf.zip
Restore network plugin configuration
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 414f0d5e3..68d153052 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -20,14 +20,14 @@ masterClientConnectionOverrides:
qps: 100
{% endif %}
masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig
-{% if openshift.common.use_openshift_sdn | bool and not openshift.common.version_gte_3_3_or_1_3 | bool %}
+{% if openshift.common.use_openshift_sdn | bool %}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
{% endif %}
# networkConfig struct introduced in origin 1.0.6 and OSE 3.0.2 which
# 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 ) and not openshift.common.version_gte_3_3_or_1_3 | bool%}
+{% if openshift.common.use_openshift_sdn | bool or openshift.common.use_nuage | bool %}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
{% endif %}
{% if openshift.node.set_node_ip | bool %}