summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-29 13:52:28 -0400
committerScott Dodson <sdodson@redhat.com>2016-07-29 13:52:28 -0400
commit2146e959481c1032a0356eb5449d38736152fe86 (patch)
treef6046535ae0975291b4b706a0a100d6a686a96d3 /roles/openshift_node
parentc70525677eed8818602d2a6db080e009689c0ca3 (diff)
downloadopenshift-2146e959481c1032a0356eb5449d38736152fe86.tar.gz
openshift-2146e959481c1032a0356eb5449d38736152fe86.tar.bz2
openshift-2146e959481c1032a0356eb5449d38736152fe86.tar.xz
openshift-2146e959481c1032a0356eb5449d38736152fe86.zip
Don't set a networkPluginName in 3.3 installs
Diffstat (limited to 'roles/openshift_node')
-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 a37770c4a..701dffa69 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -13,14 +13,14 @@ imageConfig:
kind: NodeConfig
kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }}
masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig
-{% if openshift.common.use_openshift_sdn %}
+{% if openshift.common.use_openshift_sdn | bool and not openshift.common.version_gte_3_3_or_1_3 | 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 or openshift.common.use_nuage %}
+{% 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%}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
{% endif %}
{% if openshift.node.set_node_ip | bool %}