From 47c57267ea88c684023f33e79b0afa27cc9a6cea Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 9 Jul 2024 17:35:40 +0100 Subject: [PATCH] Use UCA mirror in CI for ubuntu The previously used variable was removed [1] so the local mirror in CI has not been used. [1] https://opendev.org/openstack/openstack-ansible-openstack_hosts/src/branch/master/releasenotes/notes/apt_repo-097cb34c12e60207.yaml Change-Id: If7b77b76b192b2dec516375f834a19b0e09afbfe --- tests/roles/bootstrap-host/tasks/prepare_aio_config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index 9fbed3eca2..e86dfd69ec 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -76,8 +76,10 @@ block: - name: Configure the OpenStack-Infra mirrors vars: + _ubuntu_vars: + apt_repo_url: "{{ nodepool_vars.NODEPOOL_UCA_MIRROR }}" + _ubuntu_conditional_vars: "{{ (ansible_facts['distribution'] == 'Ubuntu') | ternary(_ubuntu_vars, {}) }}" nodepool_overrides: - uca_apt_repo_url: "{{ nodepool_vars.NODEPOOL_UCA_MIRROR }}" openstack_hosts_centos_mirror_url: "{{ nodepool_vars.NODEPOOL_CENTOS_MIRROR }}" centos_epel_mirror: "{{ nodepool_vars.NODEPOOL_EPEL_MIRROR }}" galera_repo_host: "{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}:8080" @@ -94,7 +96,7 @@ # repo: "deb http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-reef {{ ansible_facts['distribution_release'] }} main" copy: dest: /etc/openstack_deploy/user_openstackci.yml - content: "{{ nodepool_overrides | to_nice_yaml }}" + content: "{{ (nodepool_overrides | combine(_ubuntu_conditional_vars)) | to_nice_yaml }}" - name: Set the package cache timeout to 60 mins in OpenStack-CI set_fact: