diff options
| author | Vishal Patil <vishal.patil@nuagenetworks.net> | 2016-02-09 17:28:10 -0500 |
|---|---|---|
| committer | Vishal Patil <vishal.patil@nuagenetworks.net> | 2016-02-10 11:46:01 -0500 |
| commit | 2033f4ad9bdb00bfc4e91d91748a38ffe34bd861 (patch) | |
| tree | 397023ca9e557db2015e906f271632e50fa5fb2c | |
| parent | 39fc2154a5ba751b1a1550486fe33943019e8528 (diff) | |
| download | openshift-2033f4ad9bdb00bfc4e91d91748a38ffe34bd861.tar.gz openshift-2033f4ad9bdb00bfc4e91d91748a38ffe34bd861.tar.bz2 openshift-2033f4ad9bdb00bfc4e91d91748a38ffe34bd861.tar.xz openshift-2033f4ad9bdb00bfc4e91d91748a38ffe34bd861.zip | |
Enable selection of kubeproxy mode
Addressed review comments
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 9035248f9..ce77f61d1 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -33,6 +33,7 @@ set_node_ip: "{{ openshift_set_node_ip | default(None) }}" node_image: "{{ osn_image | default(None) }}" ovs_image: "{{ osn_ovs_image | default(None) }}" + proxy_mode: "{{ openshift_node_proxy_mode | default('iptables') }}" # We have to add tuned-profiles in the same transaction otherwise we run into depsolving # problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging. diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 44065f4bd..67975d372 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -35,3 +35,6 @@ servingInfo: keyFile: server.key volumeDirectory: {{ openshift.common.data_dir }}/openshift.local.volumes {% include 'partials/kubeletArguments.j2' %} +proxyArguments: + proxy-mode: + - {{ openshift.node.proxy_mode }} |