From b287fbfc6fc199147a8a7c9571822a8078b1bfff Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Wed, 1 Dec 2021 13:30:19 +0200 Subject: [PATCH] Fix NODEPOOL_CENTOS_MIRROR for 9-stream The 8 stream content is at [1] but for 9 stream the url is changed to [2] [1] http://mirror.iad3.inmotion.opendev.org/centos/8-stream [2] http://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream Change-Id: Ic7572590884988d524a71bc400dff2b7dccf601e --- roles/mirror-info/templates/mirror_info.sh.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/mirror-info/templates/mirror_info.sh.j2 b/roles/mirror-info/templates/mirror_info.sh.j2 index 05a5585..4791a0b 100644 --- a/roles/mirror-info/templates/mirror_info.sh.j2 +++ b/roles/mirror-info/templates/mirror_info.sh.j2 @@ -58,7 +58,11 @@ export NODEPOOL_PYPI_MIRROR=${NODEPOOL_PYPI_MIRROR:-http://$NODEPOOL_MIRROR_HOST export NODEPOOL_WHEEL_MIRROR=${NODEPOOL_WHEEL_MIRROR:-http://$NODEPOOL_MIRROR_HOST/wheel/$AFS_SLUG} export NODEPOOL_UBUNTU_MIRROR=${NODEPOOL_UBUNTU_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu} export NODEPOOL_UBUNTU_PORTS_MIRROR=${NODEPOOL_UBUNTU_PORTS_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu-ports} -export NODEPOOL_CENTOS_MIRROR=${NODEPOOL_CENTOS_MIRROR:-http://$NODEPOOL_MIRROR_HOST/centos} +if [[ ( $OS_TYPE == "centos" ) && ( $OS_VERSION -ge "9" ) ]]; then + export NODEPOOL_CENTOS_MIRROR=${NODEPOOL_CENTOS_MIRROR:-http://$NODEPOOL_MIRROR_HOST/centos-stream} +else + export NODEPOOL_CENTOS_MIRROR=${NODEPOOL_CENTOS_MIRROR:-http://$NODEPOOL_MIRROR_HOST/centos} +fi export NODEPOOL_DEBIAN_OPENSTACK_MIRROR=${NODEPOOL_DEBIAN_OPENSTACK_MIRROR:-http://$NODEPOOL_MIRROR_HOST/debian-openstack} export NODEPOOL_EPEL_MIRROR=${NODEPOOL_EPEL_MIRROR:-http://$NODEPOOL_MIRROR_HOST/epel} export NODEPOOL_FEDORA_MIRROR=${NODEPOOL_FEDORA_MIRROR:-http://$NODEPOOL_MIRROR_HOST/fedora}