diff --git a/roles/overcloud-prep-containers/defaults/main.yml b/roles/overcloud-prep-containers/defaults/main.yml index 1effb7a26..5533445af 100644 --- a/roles/overcloud-prep-containers/defaults/main.yml +++ b/roles/overcloud-prep-containers/defaults/main.yml @@ -10,3 +10,4 @@ container_process_count: 8 use_overcloud_mixed_upgrade: false prep_container_upgrade_run: false gating_repo_name: gating-repo +update_containers_repo: "{{ gating_repo_name }},delorean-current" 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 295719f73..8c11078d4 100644 --- a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2 +++ b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2 @@ -115,7 +115,7 @@ openstack overcloud container image upload --debug --config-file {{ working_dir ## * update the containers with yum updates from OpenStack repos. ( delorean-current, dependent patches built by DLRN ) ## :: -packages_for_update="$(repoquery --disablerepo='*' --enablerepo={{ gating_repo_name }} --qf %{NAME} -a 2>{{ working_dir }}/repoquery.err.log | sort -u | xargs)" +packages_for_update="$(repoquery --disablerepo='*' --enablerepo={{ update_containers_repo }} --qf %{NAME} -a 2>{{ working_dir }}/repoquery.err.log | sort -u | xargs)" if [[ -n "$packages_for_update" ]]; then openstack overcloud container image prepare \ diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml index 6c9e34c86..254378465 100644 --- a/roles/undercloud-deploy/defaults/main.yml +++ b/roles/undercloud-deploy/defaults/main.yml @@ -77,6 +77,8 @@ undercloud_network_environment_args: {} ctlplane_masquerade: false update_containers: false +gating_repo_name: gating-repo +update_containers_repo: "{{ gating_repo_name }},delorean-current" undercloud_enable_routed_networks: false default_undercloud_roles_data_path: "{{ undercloud_templates_path }}/roles_data_undercloud.yaml" diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 index e173ee590..c2f5737e6 100644 --- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 +++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 @@ -12,7 +12,7 @@ parameter_defaults: tasks_from: yum_update.yml compare_host_packages: true yum_repos_dir_path: /etc/yum.repos.d - update_repo: "{{ gating_repo_name|default('gating-repo') }}" + update_repo: "{{ update_containers_repo }}" {% endif %} set: tag: "{{ container_build_id }}"