From 2624e9385254e1e29b6dc5826d1b4500d345dbd0 Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Sun, 21 Jan 2024 23:13:20 +0100
Subject: [PATCH] [CI] Fix podman cross-dependency build
Change-Id: I3501e6bf17ccb94adfcdb62956dceba9d67b0881
---
tests/templates/globals-default.j2 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 6ccad4e721..80c0e083e5 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -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 }}"