openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Ubuntu: Switch back to official repository 

We replaced the ceph official repository by UCA because the official
repository didn't provide packages for jammy but now the packages
for jammy are available.

Change-Id: I4cb520c7250d0920f677c6411a493859bbf2a0ae
This commit is contained in:
Takashi Kajinami 2024-04-20 12:04:54 +09:00
parent 8deb43581f
commit ed6043010f
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
manifests/repos.pp
View File

@ -2,14 +2,6 @@ class openstack_integration::repos {
$ceph_version_real = pick($facts['ceph_version'], 'reef')
if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22') >= 0 {
# NOTE(tkajinam): Upstream ceph repository does not provide packages for
# Ubuntu Jammy, so we use packages from UCA.
$enable_ceph_repository = false
} else {
$enable_ceph_repository = true
}
case $facts['os']['family'] {
'Debian': {
case $facts['os']['name'] {
@ -34,20 +26,18 @@ class openstack_integration::repos {
}
$ceph_mirror = pick($facts['ceph_mirror_host'], "http://download.ceph.com/debian-${ceph_version_real}/")
if $enable_ceph_repository {
# 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 $ceph_mirror !~ '^http://download.ceph.com/.*' {
$ceph_version_cap = capitalize($ceph_version_real)
apt::pin { 'ceph':
priority => 1001,
originator => "Ceph ${ceph_version_cap}",
}
} else {
apt::pin { 'ceph':
priority => 1001,
origin => 'download.ceph.com',
}
# 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 $ceph_mirror !~ '^http://download.ceph.com/.*' {
$ceph_version_cap = capitalize($ceph_version_real)
apt::pin { 'ceph':
priority => 1001,
originator => "Ceph ${ceph_version_cap}",
}
} else {
apt::pin { 'ceph':
priority => 1001,
origin => 'download.ceph.com',
}
}
@ -100,12 +90,10 @@ class openstack_integration::repos {
}
}
if $enable_ceph_repository {
class { 'ceph::repo':
enable_sig => $enable_sig,
enable_epel => $enable_epel,
ceph_mirror => $ceph_mirror,
}
class { 'ceph::repo':
enable_sig => $enable_sig,
enable_epel => $enable_epel,
ceph_mirror => $ceph_mirror,
}
# NOTE(tobias-urdin): Needed where augeas is used, like puppet-ovn.