openstack
/
puppet-nova
Code Issues Proposed changes

Debian/Ubuntu: Use ceph-common instead of ceph 

The ceph package no longer requires python packages like python-ceph,
which are required by nova to use Ceph.

This change replaces the package by the ceph-common package which
require both the ceph package and the related ceph packages.

Change-Id: Ic3fda73730ac6b036082a3fd8aae531093bbcf9e
Closes-Bug: #1958092
(cherry picked from commit 228e3aa77b)
(cherry picked from commit 2f409b6d88)
(cherry picked from commit 87171b3f9b)
This commit is contained in:
Takashi Kajinami 2022-01-17 10:16:07 +09:00 committed by Christian Rohmann
parent 9f3d6e5740
commit 62353d896a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute/rbd.pp
View File

@ -103,7 +103,7 @@ class nova::compute::rbd (
package { 'ceph-client-package':
ensure => $ceph_client_ensure,
name => $nova::params::ceph_client_package_name,
tag => ['openstack'],
tag => ['openstack', 'nova-support-package'],
}
}

2
manifests/params.pp
View File

@ -87,7 +87,7 @@ class nova::params {
}
$scheduler_package_name = 'nova-scheduler'
$tgt_package_name = 'tgt'
$ceph_client_package_name = 'ceph'
$ceph_client_package_name = 'ceph-common'
$genisoimage_package_name = 'genisoimage'
# service names
$api_service_name = 'nova-api'

5
spec/classes/nova_compute_rbd_spec.rb
View File

@ -43,7 +43,8 @@ describe 'nova::compute::rbd' do
it 'installs client package' do
is_expected.to contain_package('ceph-client-package').with(
'name' => platform_params[:ceph_client_package],
'ensure' => 'present'
'ensure' => 'present',
'tag' => ['openstack', 'nova-support-package']
)
end
@ -179,7 +180,7 @@ describe 'nova::compute::rbd' do
let (:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :ceph_client_package => 'ceph' }
{ :ceph_client_package => 'ceph-common' }
when 'RedHat'
{ :ceph_client_package => 'ceph-common' }
end