From 5c4178f1ab7d51441b6c24702f299958e969d234 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 8 Jun 2022 10:59:42 +0100 Subject: [PATCH] Use nodepool centos and epel mirrors for CI jobs on centos-9 Change-Id: I6eba3763cd4550b1a5fd91a4f894d8f9a88d60b1 --- tests/roles/bootstrap-host/tasks/prepare_aio_config.yml | 4 ++-- tests/roles/bootstrap-host/tasks/prepare_networking.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index cda2edb3a3..9b8a1ac241 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -77,8 +77,8 @@ vars: nodepool_overrides: uca_apt_repo_url: "{{ nodepool_vars.NODEPOOL_UCA_MIRROR }}" - openstack_hosts_centos_mirror_url: "{{ (ansible_facts['distribution_major_version'] < '9') | ternary(nodepool_vars.NODEPOOL_CENTOS_MIRROR, 'http://mirror.centos.org/centos') }}" - centos_epel_mirror: "{{ (ansible_facts['distribution_major_version'] < '9') | ternary(nodepool_vars.NODEPOOL_EPEL_MIRROR, 'http://download.fedoraproject.org/pub/epel') }}" + 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" nova_virt_type: 'qemu' # NOTE(jrosser) diff --git a/tests/roles/bootstrap-host/tasks/prepare_networking.yml b/tests/roles/bootstrap-host/tasks/prepare_networking.yml index a1978b267e..1352a238c1 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_networking.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_networking.yml @@ -39,7 +39,7 @@ name: systemd_networkd vars: systemd_networkd_prefix: "osa_testing" - systemd_networkd_epel_mirror: "{{ (nodepool_vars is defined and ansible_facts['distribution_major_version'] < '9') | ternary(nodepool_vars.NODEPOOL_EPEL_MIRROR, 'http://download.fedoraproject.org/pub/epel') }}" + systemd_networkd_epel_mirror: "{{ (nodepool_vars is defined) | ternary(nodepool_vars.NODEPOOL_EPEL_MIRROR, 'http://download.fedoraproject.org/pub/epel') }}" systemd_interface_cleanup: true systemd_run_networkd: true systemd_netdevs: