commit d703963f99fc636f69e350feb70bf2110ea6728b Author: Rafael Folco Date: Wed Oct 14 13:59:57 2020 -0300 Fix registry for consumer jobs This fixes the registry to use content provider ip for all branches. Change-Id: I56ef6008cd5b82a5b474f43b8df303e32fcf1088 diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml index 6e5d43d..60988b7 100644 --- a/roles/extras-common/defaults/main.yml +++ b/roles/extras-common/defaults/main.yml @@ -39,7 +39,12 @@ undercloud_container_cli: >- # as for stable branches before stein the variable won't be used. overcloud_container_cli: podman local_docker_registry_host: "{{ undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1)) }}" -docker_registry_host: docker.io +docker_registry_host: >- + {% if job.consumer_job | default(false) | bool -%} + {{ job.registry_ip_address_branch[release] }}:{{ local_registry_port }} + {%- else -%} + docker.io + {%- endif -%} docker_registry_namespace: "tripleo{{ release }}" docker_image_tag: current-tripleo # docker prefix