From 8a3bdd5838383bba6c3a3edfc7307d5078080c95 Mon Sep 17 00:00:00 2001 From: Sanjay Chari Date: Thu, 9 Dec 2021 16:28:02 +0530 Subject: [PATCH] Bug fixes in rabbitmq collectd plugin This patch fixes https://bugs.launchpad.net/openstack-browbeat/+bug/1938532 and https://bugs.launchpad.net/openstack-browbeat/+bug/1938543. This patch does not fix https://bugs.launchpad.net/openstack-browbeat/+bug/1938547. The fix for the last bug will be in a separate patch. Change-Id: I0695e8f6013b718b0aab109b7006f16619081616 --- ansible/install/roles/collectd/tasks/main.yml | 4 ++-- .../roles/collectd/templates/controller.collectd.conf.j2 | 2 +- .../roles/collectd/templates/undercloud.collectd.conf.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/install/roles/collectd/tasks/main.yml b/ansible/install/roles/collectd/tasks/main.yml index a763d80fc..66f6d4bdc 100644 --- a/ansible/install/roles/collectd/tasks/main.yml +++ b/ansible/install/roles/collectd/tasks/main.yml @@ -31,8 +31,8 @@ when: "('Undercloud' in group_names and rabbitmq_undercloud_collectd_plugin)" - name: (Undercloud) Get Rabbitmq password - shell: | - grep undercloud_rabbit_password /home/stack/undercloud-passwords.conf | sed 's/undercloud_rabbit_password: //g' + command: hiera -c /etc/puppet/hiera.yaml rabbitmq::default_pass + become: true register: undercloud_rabbitmq_password when: "('Undercloud' in group_names and rabbitmq_undercloud_collectd_plugin)" diff --git a/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 index bef0caa76..dc2c97c98 100644 --- a/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 +++ b/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 @@ -767,7 +767,7 @@ LoadPlugin python Import "collectd_rabbitmq_monitoring" interval {{rabbitmq_controller_collectd_interval}} - host "{{inventory_hostname}}.internalapi.localdomain" + host 127.0.0.1 port 15672 username {{controller0_rabbitmq_username.stdout}} password {{controller0_rabbitmq_password.stdout}} diff --git a/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 b/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 index 5c0d65b58..05145e041 100644 --- a/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 +++ b/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 @@ -356,7 +356,7 @@ PreCacheChain "PreCache" Import "collectd_rabbitmq_monitoring" interval {{rabbitmq_undercloud_collectd_interval}} - host "{{undercloud_ctlplane_ip_address.stdout}}" + host 127.0.0.1 port 15672 username {{undercloud_rabbitmq_username.stdout}} password {{undercloud_rabbitmq_password.stdout}}