Merge "Fix telegraf with zookeeper (wrong port variable reference)"

ansible/roles/telegraf/templates/telegraf.conf.j2

@@ -83,7 +83,7 @@
 {% endif %}
 {% if inventory_hostname in groups['zookeeper'] and enable_zookeeper | bool %}
 [[inputs.zookeeper]]
-  servers = ["{{ api_interface_address | put_address_in_context('url') }}:{{ zookeeper_port }}"]
+  servers = ["{{ api_interface_address | put_address_in_context('url') }}:{{ zookeeper_client_port }}"]
 {% endif %}
 {% if inventory_hostname in groups['kafka'] and enable_kafka | bool %}
 [[inputs.kafka_consumer]]

releasenotes/notes/bug-1867179-9e31460ba53757d4.yaml

+---
+fixes:
+  - |
+    Fixes failure to deploy telegraf with monitoring of zookeeper due
+    to wrong variable being referenced.
+    `LP#1867179 <https://launchpad.net/bugs/1867179>`__