Skip to content

Commit 83fab63

Browse files
committed
[update_containers] Add mysqld_exporter and podman-exporter image overrides
Add ceilometerMysqldExporterImage and edpmPodmanExporterImage fields to the update_containers template. This allows Zuul content-provider jobs for mysqld_exporter and prometheus-podman-exporter to override the container images used in functional tests via the OpenStackVersion custom resource. Generated-By: Claude-Code claude-opus-4-6 Signed-off-by: Jaromir Wysoglad <jwysogla@redhat.com>
1 parent 2b5d825 commit 83fab63

4 files changed

Lines changed: 15 additions & 1 deletion

File tree

docs/dictionary/en-custom.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ edecb
203203
edploy
204204
edpm
205205
edpmnodeexporter
206+
edpmpodmanexporter
206207
ee
207208
encodings
208209
eno
@@ -390,6 +391,7 @@ multinode
390391
multipath
391392
multus
392393
myorg
394+
mysqld
393395
mytest
394396
nad
395397
namespace
@@ -491,6 +493,7 @@ pki
491493
png
492494
podified
493495
podman
496+
podmanexporter
494497
polarion
495498
polkit
496499
pragadeeswaran

roles/edpm_prepare/tasks/kustomize_and_deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
(cifmw_update_containers_openstack is defined and
3939
cifmw_update_containers_openstack | bool) or
4040
(cifmw_update_containers_watcher is defined and
41-
cifmw_update_containers_watcher | bool))
41+
cifmw_update_containers_watcher | bool) or
42+
(cifmw_update_containers_ceilometersgcoreImage is defined) or
43+
(cifmw_update_containers_ceilometermysqldexporterImage is defined) or
44+
(cifmw_update_containers_edpmpodmanexporterImage is defined))
4245
vars:
4346
cifmw_update_containers_metadata: "{{ _ctlplane_name }}"
4447
ansible.builtin.include_role:

roles/update_containers/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ If apply, please explain the privilege escalation done in this role.
2121
* `cifmw_update_containers_manilashares`: The names of the manila shares prefix. Default to `[]`.
2222
* `cifmw_update_containers_agentimage`: Full Agent Image url for updating Agent Image.
2323
* `cifmw_update_containers_ceilometersgcoreImage`: Full Ceilometersgcore Image url for updating Ceilometersgcore Image.
24+
* `cifmw_update_containers_ceilometermysqldexporterImage`: Full Ceilometer mysqld_exporter Image url for updating Ceilometer mysqld_exporter Image.
2425
* `cifmw_update_containers_edpmnodeexporterimage`: Fill EdpmNodeExporter Image url for update Nodeexporter Image.
26+
* `cifmw_update_containers_edpmpodmanexporterImage`: Fill EdpmPodmanExporter Image url for update PodmanExporter Image.
2527
* `cifmw_update_containers_openstack`: Whether to generate CR for updating openstack containers. Default to `false`.
2628
* `cifmw_update_containers_ansibleee_image_url`: Full Ansibleee Image url for updating Ansibleee Image.
2729
* `cifmw_update_containers_edpm_image_url`: Full EDPM Image url for updating EDPM OS image.

roles/update_containers/templates/update_containers.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ spec:
116116
{% if cifmw_update_containers_edpmnodeexporterimage is defined %}
117117
edpmNodeExporterImage: {{ cifmw_update_containers_edpmnodeexporterimage }}
118118
{% endif %}
119+
{% if cifmw_update_containers_ceilometermysqldexporterImage is defined %}
120+
ceilometerMysqldExporterImage: {{ cifmw_update_containers_ceilometermysqldexporterImage }}
121+
{% endif %}
122+
{% if cifmw_update_containers_edpmpodmanexporterImage is defined %}
123+
edpmPodmanExporterImage: {{ cifmw_update_containers_edpmpodmanexporterImage }}
124+
{% endif %}
119125
{% if cifmw_update_containers_agentimage is defined %}
120126
agentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/{{ cifmw_update_containers_name_prefix }}-baremetal-operator-agent:{{ cifmw_update_containers_tag }}
121127
{% endif %}

0 commit comments

Comments
 (0)