Set openstack namespace for victoria release onwards
https://review.opendev.org/747259 switches the container name preffix to openstack for master. In order to make it working for periodic jobs, we moved the var to periodic release file at https://review.opendev.org/#/c/748690/ and for check one, it will take care. Changes in container-build role takes care of provider job. Closes-Bug: #1893339 Depends-On: https://review.opendev.org/#/c/747129/ Change-Id: I56b1570d7580c2592ff9948fae94c170db674a3f Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
This commit is contained in:
parent
8c105f5581
commit
b71b15167c
|
@ -18,8 +18,11 @@ local_registry_ip: 127.0.0.1
|
||||||
local_registry_port: 5001
|
local_registry_port: 5001
|
||||||
container_registry_namespace: tripleomaster
|
container_registry_namespace: tripleomaster
|
||||||
container_tag: current-tripleo
|
container_tag: current-tripleo
|
||||||
|
# Notes(chandankumar): openstack- prefix is used from victoria release onwards
|
||||||
docker_prep_prefix: >-
|
docker_prep_prefix: >-
|
||||||
{% if job.build_container_images|default(false)|bool and not job.provider_job|default(false)|bool -%}
|
{% if (job.build_container_images|default(false)|bool and
|
||||||
|
not job.provider_job|default(false)|bool) or
|
||||||
|
release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%}
|
||||||
openstack
|
openstack
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
{{ ansible_distribution | lower }}-binary
|
{{ ansible_distribution | lower }}-binary
|
||||||
|
|
|
@ -40,11 +40,14 @@ docker_registry_host: docker.io
|
||||||
docker_registry_namespace: "tripleo{{ release }}"
|
docker_registry_namespace: "tripleo{{ release }}"
|
||||||
docker_image_tag: current-tripleo
|
docker_image_tag: current-tripleo
|
||||||
# docker prefix
|
# docker prefix
|
||||||
|
# Notes(chandankumar): openstack- prefix is used from victoria release onwards
|
||||||
docker_prep_prefix: >-
|
docker_prep_prefix: >-
|
||||||
{% if job.build_container_images|default(false)|bool and not job.provider_job|default(false)|bool -%}
|
{% if (job.build_container_images|default(false)|bool and
|
||||||
openstack-
|
not job.provider_job|default(false)|bool) or
|
||||||
|
release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%}
|
||||||
|
openstack
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
{{ ansible_distribution | lower }}-binary-
|
{{ ansible_distribution | lower }}-binary
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
# docker suffix
|
# docker suffix
|
||||||
docker_prep_suffix: ""
|
docker_prep_suffix: ""
|
||||||
|
|
Loading…
Reference in New Issue