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
This commit is contained in:
@@ -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'],
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ class nova::params {
|
||||
$libvirt_package_name = 'libvirt-daemon-system'
|
||||
$scheduler_package_name = 'nova-scheduler'
|
||||
$tgt_package_name = 'tgt'
|
||||
$ceph_client_package_name = 'ceph'
|
||||
$ceph_client_package_name = 'ceph-common'
|
||||
$mkisofs_package_name = 'genisoimage'
|
||||
$mkisofs_cmd = false
|
||||
# service names
|
||||
|
||||
@@ -42,7 +42,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
|
||||
|
||||
@@ -177,7 +178,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
|
||||
|
||||
Reference in New Issue
Block a user