openstack/puppet-openstack-integration
Code Issues Proposed changes

Debian/Ubuntu: Fix priority setting to pin ceph packages

Browse Source 
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.

Change-Id: I7b187d59f169689a7acd5cab013bb74d5cdfbf52
This commit is contained in:
Takashi Kajinami 2022-06-08 09:20:10 +09:00
parent e7d8263b27
commit cfdf592942
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/repos.pp
View File

@ -28,9 +28,11 @@ class openstack_integration::repos {
fail("Unsupported package type (${::operatingsystem})")
}
}
$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,9 @@ 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}/")
}
'RedHat': {
# Set specific variables for CentOS Stream 9