openstack/puppet-nova
Code Issues Proposed changes

Avoid ceph-common package resource conflict

Browse Source 
The ceph-common package is currently managed by multiple modules (nova,
cinder and manila). Update the resource definition to resolve conflict
among these modules.

Change-Id: I2f78b57bc469ac1cf32734a3dc2f0a2d99f47ef3
This commit is contained in:
Takashi Kajinami
2025-01-20 13:32:20 +09:00
parent 5ec3a92075
commit babb77d6b8
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute/rbd.pp
View File

@@ -134,11 +134,11 @@ class nova::compute::rbd (
if $manage_ceph_client { if $manage_ceph_client {
# Install ceph client libraries # Install ceph client libraries
package { 'ceph-client-package': ensure_packages( 'ceph-common', {
ensure => $ceph_client_ensure, ensure => $ceph_client_ensure,
name => $nova::params::ceph_client_package_name, name => $nova::params::ceph_common_package_name,
tag => ['openstack', 'nova-support-package'], })
} Package<| title == 'ceph-common' |> { tag +> 'nova-support-package' }
} }
if $facts['os']['family'] == 'Debian' { if $facts['os']['family'] == 'Debian' {

4
manifests/params.pp
View File

@@ -30,7 +30,7 @@ class nova::params {
$vncproxy_package_name = 'openstack-nova-novncproxy' $vncproxy_package_name = 'openstack-nova-novncproxy'
$serialproxy_package_name = 'openstack-nova-serialproxy' $serialproxy_package_name = 'openstack-nova-serialproxy'
$spicehtml5proxy_package_name = 'openstack-nova-console' $spicehtml5proxy_package_name = 'openstack-nova-console'
$ceph_client_package_name = 'ceph-common' $ceph_common_package_name = 'ceph-common'
$ovmf_package_name = 'edk2-ovmf' $ovmf_package_name = 'edk2-ovmf'
$swtpm_package_name = 'swtpm' $swtpm_package_name = 'swtpm'
# service names # service names
@@ -77,7 +77,7 @@ class nova::params {
$libvirt_package_name = 'libvirt-daemon-system' $libvirt_package_name = 'libvirt-daemon-system'
$libvirt_client_package_name = 'libvirt-clients' $libvirt_client_package_name = 'libvirt-clients'
$scheduler_package_name = 'nova-scheduler' $scheduler_package_name = 'nova-scheduler'
$ceph_client_package_name = 'ceph-common' $ceph_common_package_name = 'ceph-common'
$ovmf_package_name = 'ovmf' $ovmf_package_name = 'ovmf'
$swtpm_package_name = 'swtpm' $swtpm_package_name = 'swtpm'
# service names # service names

13
spec/classes/nova_compute_rbd_spec.rb
View File

@@ -44,10 +44,9 @@ describe 'nova::compute::rbd' do
end end
it 'installs client package' do it 'installs client package' do
is_expected.to contain_package('ceph-client-package').with( is_expected.to contain_package('ceph-common').with(
'name' => platform_params[:ceph_client_package], 'name' => platform_params[:ceph_common_package],
'ensure' => 'present', 'ensure' => 'installed',
'tag' => ['openstack', 'nova-support-package']
) )
end end
@@ -128,7 +127,7 @@ describe 'nova::compute::rbd' do
) )
end end
it { is_expected.to_not contain_package('ceph-client-package') } it { is_expected.to_not contain_package('ceph-common') }
end end
end end
@@ -158,9 +157,9 @@ describe 'nova::compute::rbd' do
let (:platform_params) do let (:platform_params) do
case facts[:os]['family'] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :ceph_client_package => 'ceph-common' } { :ceph_common_package => 'ceph-common' }
when 'RedHat' when 'RedHat'
{ :ceph_client_package => 'ceph-common' } { :ceph_common_package => 'ceph-common' }
end end
end end
it_configures 'nova::compute::rbd' it_configures 'nova::compute::rbd'