From f7a424a3edfeecd3fc461f1d9da31d36e774a85d Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Tue, 1 Sep 2020 14:18:38 +0300 Subject: [PATCH] Configure multinode jobs to use provider Add container registry info and disable "modify" role for containers if it's consumer job. Change-Id: I966fbba5b4db6e8c3cecd2ee1767ae5802975075 --- .../templates/containers-prepare-parameter.yaml.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 index 94d456ecd..9e6f0bc95 100644 --- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 +++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 @@ -1,12 +1,17 @@ parameter_defaults: DockerInsecureRegistryAddress: - {{ local_docker_registry_host }}:8787 +{% if job.registry_ip_address is defined %} + - {{ docker_registry_host }} +{% endif %} {% if undercloud_docker_registry_mirror is defined and undercloud_docker_registry_mirror %} DockerRegistryMirror: {{ undercloud_docker_registry_mirror }} {% endif %} ContainerImagePrepare: - push_destination: "{{ local_docker_registry_host }}:8787" -{% if update_containers|bool and not use_overcloud_mixed_upgrade|default(false)|bool %} +{% if update_containers|bool + and not use_overcloud_mixed_upgrade|default(false)|bool + and not job.consumer_job | default(false) | bool %} modify_role: tripleo-modify-image modify_append_tag: "{{ update_containers_append_tag }}" {% if release in ['rocky', 'stein'] %}