From c079f60e380681efe954a790d755eb3cd59fadb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20M=C3=A9ndez=20Hern=C3=A1ndez?= Date: Fri, 9 Jan 2026 12:18:51 +0100 Subject: [PATCH 1/2] Move Redis image to list of database images --- src/vars/images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vars/images.yml b/src/vars/images.yml index a1d5d2b0..579e8894 100644 --- a/src/vars/images.yml +++ b/src/vars/images.yml @@ -17,10 +17,10 @@ images: - "{{ candlepin_container_image }}:{{ candlepin_container_tag }}" - "{{ foreman_container_image }}:{{ foreman_container_tag }}" - "{{ pulp_container_image }}:{{ pulp_container_tag }}" - - "{{ redis_container_image }}:{{ redis_container_tag }}" database_images: - "{{ postgresql_container_image }}:{{ postgresql_container_tag }}" + - "{{ redis_container_image }}:{{ redis_container_tag }}" foreman_proxy_images: - "{{ foreman_proxy_container_image }}:{{ foreman_proxy_container_tag }}" From cb319241499449d0e82d055787b3fda4e2273b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20M=C3=A9ndez=20Hern=C3=A1ndez?= Date: Fri, 9 Jan 2026 12:21:02 +0100 Subject: [PATCH 2/2] Provide a way to consume containers from authenticated registries --- src/playbooks/_images/metadata.obsah.yaml | 34 +++++++++++++++++++ src/playbooks/pull-images/metadata.obsah.yaml | 1 + src/vars/images.yml | 16 +++++---- 3 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 src/playbooks/_images/metadata.obsah.yaml diff --git a/src/playbooks/_images/metadata.obsah.yaml b/src/playbooks/_images/metadata.obsah.yaml new file mode 100644 index 00000000..0737a88a --- /dev/null +++ b/src/playbooks/_images/metadata.obsah.yaml @@ -0,0 +1,34 @@ +--- +variables: + registry: + help: registry + registry_username: + help: registry_username + registry_password: + help: registry_password + container_tag_stream: + help: container_tag_stream + candlepin_container_image: + help: candlepin_container_image + candlepin_container_tag: + help: candlepin_container_tag + foreman_container_image: + help: foreman_container_image + foreman_container_tag: + help: foreman_container_tag + foreman_proxy_container_image: + help: foreman_proxy_container_image + foreman_proxy_container_tag: + help: foreman_proxy_container_tag + pulp_container_image: + help: pulp_container_image + pulp_container_tag: + help: pulp_container_tag + postgresql_container_image: + help: postgresql_container_image + postgresql_container_tag: + help: postgresql_container_tag + redis_container_image: + help: redis_container_image + redis_container_tag: + help: redis_container_tag diff --git a/src/playbooks/pull-images/metadata.obsah.yaml b/src/playbooks/pull-images/metadata.obsah.yaml index 9f4f8ed0..8ce1c6e7 100644 --- a/src/playbooks/pull-images/metadata.obsah.yaml +++ b/src/playbooks/pull-images/metadata.obsah.yaml @@ -4,4 +4,5 @@ help: | include: - _database_mode + - _images - _flavor_features diff --git a/src/vars/images.yml b/src/vars/images.yml index 579e8894..b4f0d26e 100644 --- a/src/vars/images.yml +++ b/src/vars/images.yml @@ -1,16 +1,18 @@ +--- +registry: quay.io container_tag_stream: "3.17" -candlepin_container_image: quay.io/foreman/candlepin +candlepin_container_image: "{{ registry }}/foreman/candlepin" candlepin_container_tag: "foreman-{{ container_tag_stream }}" -foreman_container_image: quay.io/foreman/foreman +foreman_container_image: "{{ registry }}/foreman/foreman" foreman_container_tag: "{{ container_tag_stream }}" -foreman_proxy_container_image: "quay.io/foreman/foreman-proxy" +pulp_container_image: "{{ registry }}/foreman/pulp" +pulp_container_tag: "foreman-{{ container_tag_stream }}" +foreman_proxy_container_image: "{{ registry }}/foreman/foreman-proxy" foreman_proxy_container_tag: "{{ container_tag_stream }}" -postgresql_container_image: quay.io/sclorg/postgresql-13-c9s +postgresql_container_image: "{{ registry }}/sclorg/postgresql-13-c9s" postgresql_container_tag: "latest" -pulp_container_image: quay.io/foreman/pulp -pulp_container_tag: "foreman-{{ container_tag_stream }}" -redis_container_image: quay.io/sclorg/redis-6-c9s +redis_container_image: "{{ registry }}/sclorg/redis-6-c9s" redis_container_tag: "latest" images: