Skip to content
Snippets Groups Projects
Commit 1aa1cae1 authored by Michal Nasiadka's avatar Michal Nasiadka
Browse files

CI: Rework docker_custom_option

It's not supported in ansible-collection-kolla since Zed release,
and Kolla executed Kolla-Ansible CI jobs fail on it, because
they build images.

Change-Id: Ib0358f780a77af152225761a4aa3b6acbea2eeaf
parent 24dc3461
No related branches found
No related tags found
No related merge requests found
......@@ -18,6 +18,10 @@ docker_custom_config:
debug: true
registry-mirrors:
- {{ infra_dockerhub_mirror }}
{% if need_build_image and is_previous_release %}
insecure-registries:
- primary:4000
{% endif %}
{% if ansible_facts.distribution == "openEuler" %}
exec-opts: ["native.umask=normal"]
{% endif %}
......@@ -62,13 +66,6 @@ docker_namespace: openstack.kolla
{% if docker_image_tag_suffix %}
openstack_tag_suffix: "{{ docker_image_tag_suffix }}"
{% endif %}
{% if need_build_image and is_previous_release %}
# NOTE(mgoddard): Ensure that the insecure local registry is trusted, since it
# will be the source of images during the upgrade.
# NOTE(yoctozepto): this is required here for CI because we run templating
# of docker systemd command only once
docker_custom_option: "--insecure-registry primary:4000"
{% endif %}
{% endif %}
{% if scenario == "zun" %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment