Merge "Update ceph daemon registry and tag wallaby and beyond"

This commit is contained in:
Zuul 2022-05-31 13:10:23 +00:00 committed by Gerrit Code Review
commit e4c305ee8b
1 changed files with 8 additions and 2 deletions

View File

@ -58,13 +58,19 @@ docker_prep_prefix: >-
{%- endif -%}
# docker suffix
docker_prep_suffix: ""
# NOTE(dviroel): for stable/wallaby and beyond, we will maintain centos9 hardcoded as
# distribution version for now, since we don't have a different namespace with promoted
# ceph daemon containers.
docker_ceph_namespace: >-
{% if job is defined and job.docker_ceph_namespace is defined -%}
{{ job.docker_ceph_namespace }}
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}/{{ docker_registry_namespace }}
{%- else -%}
{%- elif release in ['train','victoria'] -%}
quay.io/ceph
{%- else -%}
quay.rdoproject.org/tripleo{{release}}centos9
{%- endif -%}
docker_ceph_image: >-
{% if job is defined and job.docker_ceph_image is defined -%}
@ -82,7 +88,7 @@ docker_ceph_tag: >-
{%- elif release in ['stein','train','ussuri','victoria'] -%}
v4.0.19-stable-4.0-nautilus-centos-7-x86_64
{%- else -%}
v6.0.7-stable-6.0-pacific-centos-stream8
current-ceph
{%- endif -%}
rhel_containers: >-
{% if ansible_distribution == 'RedHat' -%}