Merge "Disable etcd for netchecker if opencontrail enabled."
diff --git a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
index 6cfac36..181765c 100644
--- a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
+++ b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
@@ -30,8 +30,11 @@
args:
- "-v=5"
- "-logtostderr"
- - "-kubeproxyinit=false"
- "-endpoint=0.0.0.0:{{ common.addons.netchecker.port }}"
+{%- if common.addons.get('contrail_network_controller', {}).get('enabled') %}
+ - "-kubeproxyinit=true"
+{%- else %}
+ - "-kubeproxyinit=false"
- "-etcd-endpoints={% for member in master.etcd.members %}https://{{ member.host }}:4001{% if not loop.last %},{% endif %}{% endfor %}"
{%- if master.etcd.get('ssl', {}).get('enabled') %}
- "-etcd-key=/var/lib/etcd/etcd-client.key"
@@ -46,3 +49,4 @@
- hostPath:
path: /var/lib/etcd
name: etcd-certs
+{%- endif %}
\ No newline at end of file