diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-10 15:43:02 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-10 15:43:02 -0500 |
| commit | b6db3a50edb3b2b53440016f305b063c009fe26d (patch) | |
| tree | 3e013bb3c1627c3bed2d947015cf21ab40634221 | |
| parent | 777fd8b3b964e3780660f733d7539a6e86ed3b66 (diff) | |
| parent | 2033f4ad9bdb00bfc4e91d91748a38ffe34bd861 (diff) | |
| download | openshift-b6db3a50edb3b2b53440016f305b063c009fe26d.tar.gz openshift-b6db3a50edb3b2b53440016f305b063c009fe26d.tar.bz2 openshift-b6db3a50edb3b2b53440016f305b063c009fe26d.tar.xz openshift-b6db3a50edb3b2b53440016f305b063c009fe26d.zip | |
Merge pull request #1363 from vishpat/kubeproxy
Enable selection of kubeproxy mode
| -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 1df81ca00..acf2f74e3 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 }} |