Merge pull request #1417 from stackhpc/ironic-inspector-blackbox-backend

Fix ironic-inspector blackbox backend endpoint
stackhpc · Dec 10, 2024 · d1ffd24 · d1ffd24
2 parents 3d049fc + 3f0402e
commit d1ffd24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter b/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter
@@ -167,7 +167,7 @@ prometheus_blackbox_exporter_endpoints_default:
     enabled: "{{ enable_placement | bool }}"
   - endpoints: "{% set ironic_endpoints = [] %}{% for host in groups.get('ironic-api', []) %}{{ ironic_endpoints.append('ironic_backend_' + host.replace('-', '') + ':os_endpoint:' + ('https' if kolla_enable_tls_backend | bool else 'http') + '://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['ironic_api_port']) }}{% endfor %}{{ ironic_endpoints }}"
     enabled: "{{ enable_ironic | bool }}"
-  - endpoints: "{% set ironic_inspector_endpoints = [] %}{% for host in groups.get('ironic-inspector', []) %}{{ ironic_inspector_endpoints.append('ironic_inspector_backend_' + host.replace('-', '') + ':os_endpoint:' + ('https' if kolla_enable_tls_backend | bool else 'http') + '://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['ironic_inspector_port']) }}{% endfor %}{{ ironic_inspector_endpoints }}"
+  - endpoints: "{% set ironic_inspector_endpoints = [] %}{% for host in groups.get('ironic-inspector', []) %}{{ ironic_inspector_endpoints.append('ironic_inspector_backend_' + host.replace('-', '') + ':os_endpoint:' + 'http://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['ironic_inspector_port']) }}{% endfor %}{{ ironic_inspector_endpoints }}"
     enabled: "{{ enable_ironic | bool }}"
   - endpoints: "{% set swift_endpoints = [] %}{% for host in groups.get('swift-api', []) %}{{ swift_endpoints.append('swift_backend_' + host.replace('-', '') + ':os_endpoint:' + 'http://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['swift_api_port']) }}{% endfor %}{{ swift_endpoints }}"
     enabled: "{{ enable_swift | bool }}"

diff --git a/releasenotes/notes/ironic-inspector-blackbox-backend-ff1bd68297435a36.yaml b/releasenotes/notes/ironic-inspector-blackbox-backend-ff1bd68297435a36.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes the Prometheus Blackbox Exporter backend endpoint for
+    ironic-inspector, as this service does not support backend TLS.