openstack
/
kolla-ansible
Code Issues Proposed changes

use docker_custom_config override for Kolla CI upgrade jobs 

In Kolla CI K-A upgrade job needs docker_custom_config override
as docker_registry var is being used both for docker daemon
config - for kolla images build, and kolla-ansible container images
sources - where we're using quay.io mirror.
docker_custom_config gets precedence in docker daemon
configuration.

docker_custom_config was removed in [1].

[1] https://review.opendev.org/c/openstack/kolla-ansible/+/904067

Change-Id: I1e890223faf25b1169a49e22a9529f90806d2f3a
This commit is contained in:
Bartosz Bezak 2024-01-17 12:45:23 +01:00
parent 77c18fa615
commit 1d38ff5e9c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,15 @@ podman_registry_insecure: true
docker_debug: true
docker_registry_mirrors:
- {{ infra_dockerhub_mirror }}
# NOTE(bbezak): In Kolla CI K-A upgrade job needs following override
# as docker_registry var is being used both for docker daemon config
# - for kolla images build, and kolla-ansible container images sources.
# docker_custom_config gets precedence in docker daemon configuration.
{% if need_build_image and is_previous_release %}
docker_registry: "primary:4000"
docker_registry_insecure: true
docker_custom_config:
insecure-registries:
- primary:4000
{% endif %}
{% if ansible_facts.distribution == "openEuler" %}
docker_custom_config: