diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-08-03 12:20:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-03 12:20:03 -0700 |
| commit | bb10c3ee0ae4736b5e5c912592654baad07f8203 (patch) | |
| tree | 747f84114797d53d1258c7fa0bb217d91519133e | |
| parent | fdb012e7f930e3a037a7b434db5b1ac310739f8f (diff) | |
| parent | 2146e959481c1032a0356eb5449d38736152fe86 (diff) | |
| download | openshift-bb10c3ee0ae4736b5e5c912592654baad07f8203.tar.gz openshift-bb10c3ee0ae4736b5e5c912592654baad07f8203.tar.bz2 openshift-bb10c3ee0ae4736b5e5c912592654baad07f8203.tar.xz openshift-bb10c3ee0ae4736b5e5c912592654baad07f8203.zip | |
Merge pull request #2238 from sdodson/no-network-plugin
Don't set a networkPluginName in 3.3 installs
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 4 |
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 %} |