From 4af1488171f498a3de5f4f79683be776cb785d12 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 24 Jan 2025 11:00:35 +0100
Subject: [PATCH] Add ironic-prometheus-exporter

---
 etc/kayobe/kolla-image-tags.yml                             | 3 +++
 etc/kayobe/kolla.yml                                        | 2 +-
 etc/kayobe/pulp.yml                                         | 1 +
 .../notes/ironic-prometheus-exporter-f9301ef233d47291.yaml  | 6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/ironic-prometheus-exporter-f9301ef233d47291.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 9d6d7580e..e0094cb96 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -6,3 +6,6 @@ kolla_image_tags:
   openstack:
     rocky-9: 2024.1-rocky-9-20241218T141751
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
+  ironic_prometheus_exporter:
+    rocky-9: 2024.1-rocky-9-20250124T081816
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index b7e75fd8f..4b6c7f4c3 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -635,7 +635,7 @@ kolla_enable_heat: false
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
 #kolla_enable_ironic_neutron_agent:
-kolla_enable_ironic_prometheus_exporter: false
+#kolla_enable_ironic_prometheus_exporter:
 #kolla_enable_iscsid:
 #kolla_enable_keepalived:
 #kolla_enable_keystone:
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index e55b82bb3..4db12d267 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -478,6 +478,7 @@ stackhpc_pulp_images_kolla:
   - ironic-conductor
   - ironic-inspector
   - ironic-neutron-agent
+  - ironic-prometheus-exporter
   - ironic-pxe
   - keepalived
   - keystone
diff --git a/releasenotes/notes/ironic-prometheus-exporter-f9301ef233d47291.yaml b/releasenotes/notes/ironic-prometheus-exporter-f9301ef233d47291.yaml
new file mode 100644
index 000000000..d8e64e889
--- /dev/null
+++ b/releasenotes/notes/ironic-prometheus-exporter-f9301ef233d47291.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    ``ironic-prometheus-exporter`` container image has been added and enabled
+    by default when kolla_enable_ironic and kolla_enable_prometheus are true
+    (following upstream defaults).