openstack/kolla-ansible
Code Issues Proposed changes

Merge "[CI] Fix podman cross-dependency build"

Browse Source
This commit is contained in:
Zuul 2024-01-26 17:07:07 +00:00 committed by Gerrit Code Review
commit 416851ce9d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/templates/globals-default.j2
View File

@ -77,11 +77,19 @@ docker_namespace: "lokolla"
# see: https://github.com/moby/moby/issues/39033
docker_registry: "primary:4000"
docker_registry_insecure: yes
{% if container_engine == 'podman' %}
podman_registry: "primary:4000"
podman_registry_insecure: yes
{% endif %}
openstack_tag: "{{ build_image_tag }}"
{% else %}
# use the published images from a site mirror of quay.io
docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
docker_registry_insecure: no
{% if container_engine == 'podman' %}
podman_registry: "{{ zuul_site_mirror_fqdn }}:4447"
podman_registry_insecure: no
{% endif %}
docker_namespace: openstack.kolla
{% if docker_image_tag_suffix %}
openstack_tag_suffix: "{{ docker_image_tag_suffix }}"