commit 8d535ec0f9e91dc4a40f014edb2a27b5b3662f2d
Author: Marios Andreou <marios@redhat.com>
Date:   Wed Sep 23 17:19:42 2020 +0300

    Wire up job.registry_ip_address_branch for content provider jobs
    
    Wires up the content provider container registry address into
    DockerInsecureRegistryAddress. Makes sure we are using the
    _address_branch version in all other references to the
    job.registry_ip_address var.
    
    Needed by the upgrade jobs in https://review.opendev.org/753403
    Change-Id: If9b516860ad3f102e39cb8755cd8aee6f9aae413

diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index 5b5ef96..d58f1d4 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -55,8 +55,8 @@ docker_prep_prefix: >-
 # docker suffix
 docker_prep_suffix: ""
 docker_ceph_namespace: >-
-  {% if job.consumer_job|default(false)|bool -%}
-  {{ job.registry_ip_address }}:{{ local_registry_port }}/{{ docker_registry_namespace }}
+  {% if job.consumer_job | default(false) | bool -%}
+  {{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}/{{ docker_registry_namespace }}
   {%- elif release not in ['queens', 'rocky', 'pike'] -%}
   quay.ceph.io/ceph-ci
   {%- else -%}
diff --git a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2 b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
index 8706c73..e542cb3 100644
--- a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
+++ b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
@@ -42,8 +42,8 @@ openstack overcloud container image prepare \
     --output-images-file {{ working_dir }}/overcloud_containers.yaml \
     --output-env-file {{ working_dir }}/containers-default-parameters.yaml \
     ${PREPARE_ARGS} \
-{% if job.consumer_job | default(false) | bool and job.registry_ip_address is defined %}
-    --namespace "{{ job.registry_ip_address }}:{{ local_registry_port }}/{{ docker_registry_namespace_used }}" \
+{% if job.consumer_job | default(false) | bool %}
+    --namespace "{{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}/{{ docker_registry_namespace_used }}" \
 {% else %}
     --namespace "{{ docker_registry_host }}/{{ docker_registry_namespace_used }}" \
 {% endif %}
diff --git a/roles/standalone-upgrade/templates/standalone_config.yaml.j2 b/roles/standalone-upgrade/templates/standalone_config.yaml.j2
index e5ad08c..dd27780 100644
--- a/roles/standalone-upgrade/templates/standalone_config.yaml.j2
+++ b/roles/standalone-upgrade/templates/standalone_config.yaml.j2
@@ -9,6 +9,9 @@ parameter_defaults:
   DnsServers: {{ undercloud_undercloud_nameservers }}
   DockerInsecureRegistryAddress:
   - {{ standalone_ip }}:8787
+{% if job.consumer_job | default(false) | bool %}
+  - {{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}
+{% endif %}
 {% if undercloud_docker_registry_mirror is defined and undercloud_docker_registry_mirror %}
   DockerRegistryMirror: {{undercloud_docker_registry_mirror}}
 {% endif %}
diff --git a/roles/standalone/templates/standalone_config.yaml.j2 b/roles/standalone/templates/standalone_config.yaml.j2
index 52fab3d..b9cbce9 100644
--- a/roles/standalone/templates/standalone_config.yaml.j2
+++ b/roles/standalone/templates/standalone_config.yaml.j2
@@ -9,14 +9,14 @@ parameter_defaults:
   DockerPuppetDebug: {{ standalone_tripleo_deploy_debug_arg }}
   DeploymentUser: {{ undercloud_user }}
   DnsServers: {{ undercloud_undercloud_nameservers | to_json }}
-{% if standalone_container_prep_updates is defined and standalone_container_prep_updates %}
+{% if job.consumer_job|default(false)|bool or (standalone_container_prep_updates is defined and standalone_container_prep_updates) %}
   DockerInsecureRegistryAddress:
   - {{ standalone_ip }}:8787
 {% if job.build_container_images|default(false)|bool or job.consumer_job|default(false)|bool %}
   - {{ local_registry_ip }}:{{ local_registry_port }}
 {% endif %}
-{% if job.registry_ip_address is defined %}
-  - {{ job.registry_ip_address }}:{{ local_registry_port }}
+{% if job.consumer_job | default(false) | bool %}
+  - {{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}
 {% endif %}
 {% endif %}
 {% if undercloud_docker_registry_mirror is defined and undercloud_docker_registry_mirror %}
diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
index c3a7a46..4734b8f 100644
--- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
+++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
@@ -1,8 +1,8 @@
 parameter_defaults:
   DockerInsecureRegistryAddress:
   - {{ local_docker_registry_host }}:8787
-{% if job.registry_ip_address is defined %}
-  - {{ docker_registry_host }}
+{% if job.consumer_job | default(false) | bool %}
+  - {{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}
 {% endif %}
 {% if undercloud_docker_registry_mirror is defined and undercloud_docker_registry_mirror %}
   DockerRegistryMirror: {{ undercloud_docker_registry_mirror }}
@@ -35,8 +35,8 @@ parameter_defaults:
 {% endif %}
     set:
       tag: "{{ container_build_id }}"
-{% if job.consumer_job | default(false) | bool and job.registry_ip_address is defined %}
-      namespace: "{{ job.registry_ip_address }}:{{ local_registry_port }}/{{ docker_registry_namespace_used }}"
+{% if job.consumer_job | default(false) | bool %}
+      namespace: "{{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }}/{{ docker_registry_namespace_used }}"
 {% else %}
       namespace: "{{ docker_registry_host }}/{{ docker_registry_namespace_used }}"
 {% endif %}