openstack/kolla-ansible
Code Issues Proposed changes

Merge "Revert "CI - remove unnecessary logic when building images for upgrade""

Browse Source
This commit is contained in:
Zuul 2019-07-01 15:48:47 +00:00 committed by Gerrit Code Review
commit 470108a1c0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,11 @@ openstack_release: "{{ build_image_tag }}"
{% else %} {% else %}
# use docker hub images # use docker hub images
docker_namespace: "kolla" docker_namespace: "kolla"
{% 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.
docker_custom_option: "--insecure-registry {{ api_interface_address }}:4000"
{% endif %}
{% if not is_previous_release %} {% if not is_previous_release %}
openstack_release: "{{ zuul.branch | basename }}" openstack_release: "{{ zuul.branch | basename }}"
{% else %} {% else %}