From f79e02b59bd07b06d2bc71a126ebfb4de1fdd3cd Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 Jun 2022 09:20:10 +0900 Subject: [PATCH] Debian/Ubuntu: Fix priority setting to pin ceph packages Since 13044d9f9e8fe0385ba68a458a301cc82188f08b was merged, we use the upstream ceph repo to pull packages for Ubuntu, and this broke the priority setting to avoid installing ceph packages from UCA repo. This change fixes that and ensure the priority is configured with the ceph repo. Backport note: This change includes 972a226ab7ca964e2254cd574362c9e170dfbebf which fixed the circular dependencies caused by the original change. Change-Id: I7b187d59f169689a7acd5cab013bb74d5cdfbf52 (cherry picked from commit cfdf592942f1d2153eb0a3d0a4c7a0026cceda07) (cherry picked from commit 7d9fd6332b1ebc29c2ab21e09697be2751bd73d3) --- manifests/repos.pp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/repos.pp b/manifests/repos.pp index 029bf3866..892614f2f 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -28,9 +28,11 @@ class openstack_integration::repos { fail("Unsupported package type (${::os_package_type})") } } + + $ceph_mirror_fallback = pick($::ceph_mirror_host, "http://download.ceph.com/debian-${ceph_version_real}/") # Ceph is both packaged on UCA and official download.ceph.com packages # which we mirror. We want to use the official packages or our mirror. - if defined('$::nodepool_mirror_host') and $::nodepool_mirror_host != '' { + if $ceph_mirror_fallback !~ '^http://download.ceph.com/.*' { $ceph_version_cap = capitalize($ceph_version_real) apt::pin { 'ceph': priority => 1001, @@ -42,9 +44,10 @@ class openstack_integration::repos { origin => 'download.ceph.com', } } + $enable_sig = false $enable_epel = false - $ceph_mirror = pick($::ceph_mirror_host, "http://download.ceph.com/debian-${ceph_version_real}/") + $ceph_mirror = $ceph_mirror_fallback } 'RedHat': { if defined('$::centos_mirror_host') and $::centos_mirror_host != '' {