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

tests/templates/globals-default.j2

@@ -24,6 +24,11 @@ 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 %}