Merge "Add support for container_extra_config"

This commit is contained in:
Zuul 2022-09-05 13:29:53 +00:00 committed by Gerrit Code Review
commit a53be4f6d5
2 changed files with 23 additions and 0 deletions

View File

@ -33,3 +33,9 @@ containers_base_image: "{{ job.containers_base_image|default('ubi8') }}"
container_registry_image: quay.io/tripleoci/registry:2 container_registry_image: quay.io/tripleoci/registry:2
container_registry_image_fallback: trunk.registry.rdoproject.org/ceph/registry:2 container_registry_image_fallback: trunk.registry.rdoproject.org/ceph/registry:2
container_exclude_distro: "{{ ansible_distribution|lower }}{{ ansible_distribution_major_version}}" container_exclude_distro: "{{ ansible_distribution|lower }}{{ ansible_distribution_major_version}}"
# Extra config needs to be passed to tcib tool
# https://docs.openstack.org/tripleo-ansible/latest/roles/role-tripleo_container_image_build.html#r-o-l-e-d-e-f-a-u-l-t-s
container_extra_config:
tcib_args:
TRIPLEO_ANSIBLE_REQ: /usr/share/openstack-tripleo-common-containers/container-images/kolla/tripleo-ansible-ee/requirements.yaml
ANSIBLE_RUNNER_IMAGE: quay.io/tripleoansible/ansible-runner:stream9

View File

@ -99,6 +99,22 @@
- "tcib_python_version={{ (ansible_distribution_major_version|int < 9) | ternary ('3.6', '3.9') }}" - "tcib_python_version={{ (ansible_distribution_major_version|int < 9) | ternary ('3.6', '3.9') }}"
when: release not in ['train', 'ussuri', 'victoria'] when: release not in ['train', 'ussuri', 'victoria']
- name: Add tcib extra config params
when:
- container_extra_config is defined
- release not in ['train', 'wallaby']
block:
- name: Generate config params
copy:
dest: "{{ ansible_user_dir }}/extra_config.yaml"
content: |
{{ container_extra_config | to_nice_yaml }}
- name: Set tcib config params
set_fact:
tcib_extra_config: "{{ ansible_user_dir }}/extra_config.yaml"
- name: Build and push container images to the local registry - name: Build and push container images to the local registry
collections: collections:
- tripleo.operator - tripleo.operator
@ -119,6 +135,7 @@
tripleo_container_image_build_base: "{{ containers_base_image }}" tripleo_container_image_build_base: "{{ containers_base_image }}"
tripleo_container_image_build_excludes: "{{ exclude_containers[branch][container_exclude_distro]|default([]) }}" tripleo_container_image_build_excludes: "{{ exclude_containers[branch][container_exclude_distro]|default([]) }}"
tripleo_container_image_build_tcib_extras: "{{ tcib_extras | default([]) }}" tripleo_container_image_build_tcib_extras: "{{ tcib_extras | default([]) }}"
tripleo_container_image_build_extra_config: "{{ tcib_extra_config | default('') }}"
tripleo_container_image_build_distro: "{{ (ansible_distribution == 'RedHat') | ternary('rhel', 'centos') }}" tripleo_container_image_build_distro: "{{ (ansible_distribution == 'RedHat') | ternary('rhel', 'centos') }}"
- name: Pull and push non *tripleo* container images to local registry - name: Pull and push non *tripleo* container images to local registry