openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Set ceph container variables if defined in job 

This patch updates extra-commons to check if a ceph namespace, tag or
image was provided within jobs definition.

Change-Id: Ibae7b900cf027c6b610c55399aad3d56e8fdb512
Signed-off-by: Douglas Viroel <dviroel@redhat.com>
This commit is contained in:
Douglas Viroel 2022-03-21 18:32:50 -03:00
parent 56f0af5b7e
commit 78b7588516
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
roles/extras-common/defaults/main.yml
View File

@ -59,14 +59,23 @@ docker_prep_prefix: >-
# docker suffix
docker_prep_suffix: ""
docker_ceph_namespace: >-
{% if job.consumer_job | default(false) | bool -%}
{% 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 -%}
quay.io/ceph
{%- endif -%}
docker_ceph_image: daemon
docker_ceph_image: >-
{% if job is defined and job.docker_ceph_image is defined -%}
{{ job.docker_ceph_image }}
{%- else -%}
daemon
{%- endif -%}
docker_ceph_tag: >-
{% if release in ['pike'] -%}
{% if job is defined and job.docker_ceph_tag is defined -%}
{{ job.docker_ceph_tag }}
{%- elif release in ['pike'] -%}
v3.0.3-stable-3.0-jewel-centos-7-x86_64
{%- elif release in ['queens'] -%}
v3.2.14-stable-3.2-luminous-centos-7-x86_64

2
roles/standalone/defaults/main.yml
View File

@ -43,7 +43,7 @@ standalone_container_cli: docker
standalone_custom_env_files: []
standalone_container_ceph_updates: false
standalone_container_ceph_updates: "{{ job.standalone_container_ceph_updates|default(false)|bool }}"
standalone_tripleo_deploy_debug_arg: false