| commit | 6a9eebb86692a969264ecd6103b7bd4a9a6c4d93 | [log] [tgz] |
|---|---|---|
| author | Matthew Mosesohn <mmosesohn@mirantis.com> | Mon Jun 05 19:28:25 2017 +0300 |
| committer | Matthew Mosesohn <mmosesohn@mirantis.com> | Mon Jun 05 19:28:25 2017 +0300 |
| tree | 9918d8217c1add186482a8c0f5f762565ea8a339 | |
| parent | 92185db2099a94199945a1ccee0eda59bd234d2d [diff] |
Disable kube-proxy if using opencontrail Change-Id: I72290b7d50a6322894bcaf414aa49827ba406bf3
diff --git a/kubernetes/pool/kube-proxy.sls b/kubernetes/pool/kube-proxy.sls index 64d2945..b065f4f 100644 --- a/kubernetes/pool/kube-proxy.sls +++ b/kubernetes/pool/kube-proxy.sls
@@ -1,5 +1,5 @@ {%- from "kubernetes/map.jinja" import pool with context %} -{%- if pool.enabled %} +{%- if pool.enabled and pool.network.engine != 'opencontrail' %} {%- if pool.get('container', 'true') %}