openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Debian/Ubuntu: Fix priority setting to pin ceph packages"

Browse Source
This commit is contained in:
Zuul 2022-06-28 14:46:17 +00:00 committed by Gerrit Code Review
commit d1c02c5390
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})") 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 # 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. # 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) $ceph_version_cap = capitalize($ceph_version_real)
apt::pin { 'ceph': apt::pin { 'ceph':
priority => 1001, priority => 1001,
@ -42,9 +44,9 @@ class openstack_integration::repos {
origin => 'download.ceph.com', origin => 'download.ceph.com',
} }
} }
$enable_sig = false $enable_sig = false
$enable_epel = false $enable_epel = false
$ceph_mirror = pick($::ceph_mirror_host, "http://download.ceph.com/debian-${ceph_version_real}/")
} }
'RedHat': { 'RedHat': {
# Set specific variables for CentOS Stream 9 # Set specific variables for CentOS Stream 9