From 884eacc70ea527b975b95e2837e7cf24e9417215 Mon Sep 17 00:00:00 2001 From: Piotr Milewski Date: Thu, 9 Jan 2025 14:08:15 +0100 Subject: [PATCH] Prometheus: Fix target when TLS for rabbitmq is disabled Closes-Bug: #2093335 Change-Id: I7061aa65673a3b8d2e95e43f124587546e21b715 --- ansible/roles/prometheus/defaults/main.yml | 2 +- releasenotes/notes/bug-2093335-88ecb9b12a003b20.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-2093335-88ecb9b12a003b20.yaml diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index e5588d3a26..e25a073cd1 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -339,7 +339,7 @@ prometheus_blackbox_exporter_endpoints_default: - endpoints: - "prometheus_alertmanager:http_2xx_alertmanager:{{ prometheus_alertmanager_public_endpoint if enable_prometheus_alertmanager_external else prometheus_alertmanager_internal_endpoint }}" enabled: "{{ enable_prometheus_alertmanager | bool }}" - - endpoints: "{% set rabbitmq_endpoints = [] %}{% for host in groups.get('rabbitmq', []) %}{{ rabbitmq_endpoints.append('rabbitmq_' + host + (':tls_connect:' if rabbitmq_enable_tls else ':tcp_connect:') + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['rabbitmq_port'] ) }}{% endfor %}{{ rabbitmq_endpoints }}" + - endpoints: "{% set rabbitmq_endpoints = [] %}{% for host in groups.get('rabbitmq', []) %}{{ rabbitmq_endpoints.append('rabbitmq_' + host + (':tls_connect:' if rabbitmq_enable_tls | bool else ':tcp_connect:') + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['rabbitmq_port'] ) }}{% endfor %}{{ rabbitmq_endpoints }}" enabled: "{{ enable_rabbitmq | bool }}" - endpoints: "{% set redis_endpoints = [] %}{% for host in groups.get('redis', []) %}{{ redis_endpoints.append('redis_' + host + ':tcp_connect:' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['redis_port']) }}{% endfor %}{{ redis_endpoints }}" enabled: "{{ enable_redis | bool }}" diff --git a/releasenotes/notes/bug-2093335-88ecb9b12a003b20.yaml b/releasenotes/notes/bug-2093335-88ecb9b12a003b20.yaml new file mode 100644 index 0000000000..b99e9ae56c --- /dev/null +++ b/releasenotes/notes/bug-2093335-88ecb9b12a003b20.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes ``rabbitmq_enable_tls`` in main.yaml file + variable was not a boolean type. + `LP#2093335 `__