summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-31 22:09:07 -0400
committerGitHub <noreply@github.com>2016-08-31 22:09:07 -0400
commit7b1637a81eff17882cabf6141699526b5fb13e71 (patch)
tree08c8733b1a985b3e50a786fbd9233f4277c8ab30 /roles
parent323ac4e6e5be0cec8fe3ecef8df475c508b7975c (diff)
parent9956728a72fc80a789f54c40a761936203169bdf (diff)
downloadopenshift-7b1637a81eff17882cabf6141699526b5fb13e71.tar.gz
openshift-7b1637a81eff17882cabf6141699526b5fb13e71.tar.bz2
openshift-7b1637a81eff17882cabf6141699526b5fb13e71.tar.xz
openshift-7b1637a81eff17882cabf6141699526b5fb13e71.zip
Merge pull request #2394 from sdodson/revert-2238
Restore network plugin configuration
Diffstat (limited to 'roles')
-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 %}