diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-07 10:57:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 10:57:28 -0400 |
| commit | 6da235f41a31776b1bc253a34dc14a30307e331e (patch) | |
| tree | bda2cc62691a59fb6ac6ed4978fa7f15ec046121 /roles/openshift_node/templates/node.yaml.v1.j2 | |
| parent | aad4ccce7ce6641d3c720507568f6da779a66995 (diff) | |
| parent | 8bf97723ceaca02fe12b86466f8383aa211ead5e (diff) | |
| download | openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.gz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.bz2 openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.xz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.zip | |
Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_node/templates/node.yaml.v1.j2')
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index f59aa6fb4..7049f7189 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -37,15 +37,15 @@ masterClientConnectionOverrides: qps: 100 {% endif %} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig -{% if openshift.common.use_openshift_sdn | bool %} -networkPluginName: {{ openshift.common.sdn_network_plugin_name }} +{% if openshift_node_use_openshift_sdn | bool %} +networkPluginName: {{ openshift_node_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 or openshift.common.use_contiv | bool or openshift.common.sdn_network_plugin_name == 'cni' %} - networkPluginName: {{ openshift.common.sdn_network_plugin_name }} +{% if openshift_node_use_openshift_sdn | bool or openshift_node_use_nuage | bool or openshift_node_use_contiv | bool or openshift_node_sdn_network_plugin_name == 'cni' %} + networkPluginName: {{ openshift_node_sdn_network_plugin_name }} {% endif %} {% if openshift.node.set_node_ip | bool %} nodeIP: {{ openshift.common.ip }} @@ -66,7 +66,7 @@ servingInfo: - {{ cipher_suite }} {% endfor %} {% endif %} -volumeDirectory: {{ openshift.common.data_dir }}/openshift.local.volumes +volumeDirectory: {{ openshift_node_data_dir }}/openshift.local.volumes proxyArguments: proxy-mode: - {{ openshift.node.proxy_mode }} |