diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-20 11:02:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 11:02:23 -0400 |
| commit | 94a75431044d6124dcb22659cbecbb09c3cb3a38 (patch) | |
| tree | 22f83883627f562e42e775f029a2415cafba60d9 /roles/openshift_node/templates | |
| parent | 30d3fc6ed990c8e9f13b4e96e6e7acff13500e1e (diff) | |
| parent | e6ea6839a8f657c1266c25ba4aba43c837329fa3 (diff) | |
| download | openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.gz openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.bz2 openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.xz openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.zip | |
Merge pull request #5574 from dulek/containerized_kuryr_support
Initial Kuryr support
Diffstat (limited to 'roles/openshift_node/templates')
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 08e1c7f4f..718d35dca 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -44,7 +44,7 @@ networkPluginName: {{ openshift_node_sdn_network_plugin_name }} # deprecates networkPluginName above. The two should match. networkConfig: mtu: {{ openshift.node.sdn_mtu }} -{% 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' %} +{% if openshift_node_use_openshift_sdn | bool or openshift_node_use_nuage | bool or openshift_node_use_contiv | bool or openshift_node_use_kuryr | bool or openshift_node_sdn_network_plugin_name == 'cni' %} networkPluginName: {{ openshift_node_sdn_network_plugin_name }} {% endif %} {% if openshift.node.set_node_ip | bool %} @@ -67,9 +67,11 @@ servingInfo: {% endfor %} {% endif %} volumeDirectory: {{ openshift_node_data_dir }}/openshift.local.volumes +{% if not (openshift_node_use_kuryr | default(False)) | bool %} proxyArguments: proxy-mode: - {{ openshift.node.proxy_mode }} +{% endif %} volumeConfig: localQuota: perFSGroup: {{ openshift.node.local_quota_per_fsgroup }} |