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

This commit is contained in:
Zuul 2019-06-24 13:08:18 +00:00 committed by Gerrit Code Review
commit 8622d6fcc6

View File

@ -24,11 +24,6 @@ openstack_release: "{{ build_image_tag }}"
{% else %}
# use docker hub images
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 %}
openstack_release: "{{ zuul.branch | basename }}"
{% else %}