commit 53c497598e2a37c84e99c41fafa533fdfbb940da
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Oct 23 10:50:50 2018 +0000
committer Gerrit Code Review <mail@domain.com> Tue Oct 23 10:50:50 2018 +0000
tree d49599b16664d03a3f5f6e476862ed02cdba86dc
parent da49c402113f5e6be5ed580829ca7c9df2714715
parent 1fb917199b3a087412495095e31a844d407a44cd

Merge "Fix condition for haproxy opencontrail tagdrop"

opencontrail/meta/telegraf.yml

diff --git a/opencontrail/meta/telegraf.yml b/opencontrail/meta/telegraf.yml
index 523311b..c3224c9 100644
--- a/opencontrail/meta/telegraf.yml
+++ b/opencontrail/meta/telegraf.yml
@@ -243,7 +243,7 @@
           state: "Established"
     {%- endif %}
   {%- endif %}
-  {%- if pillar.haproxy.proxy is defined %}
+  {%- if pillar.haproxy is defined and pillar.haproxy.proxy is defined %}
     haproxy:
       tagdrop:
         proxy: ["contrail_collector_stats", "contrail_config_stats", "contrail_openstack_stats"]