From babb77d6b8bdd2f02fbf2f5254f01ed0a335e825 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 20 Jan 2025 13:32:20 +0900
Subject: [PATCH] Avoid ceph-common package resource conflict

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
---
 manifests/compute/rbd.pp              |  8 ++++----
 manifests/params.pp                   |  4 ++--
 spec/classes/nova_compute_rbd_spec.rb | 13 ++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
index 3649c4934..5a54b35ba 100644
--- a/manifests/compute/rbd.pp
+++ b/manifests/compute/rbd.pp
@@ -134,11 +134,11 @@ class nova::compute::rbd (
 
   if $manage_ceph_client {
     # Install ceph client libraries
-    package { 'ceph-client-package':
+    ensure_packages( 'ceph-common', {
       ensure => $ceph_client_ensure,
-      name   => $nova::params::ceph_client_package_name,
-      tag    => ['openstack', 'nova-support-package'],
-    }
+      name   => $nova::params::ceph_common_package_name,
+    })
+    Package<| title == 'ceph-common' |> { tag +> 'nova-support-package' }
   }
 
   if $facts['os']['family'] == 'Debian' {
diff --git a/manifests/params.pp b/manifests/params.pp
index fd85eff85..1aa06d8c5 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -30,7 +30,7 @@ class nova::params {
       $vncproxy_package_name             = 'openstack-nova-novncproxy'
       $serialproxy_package_name          = 'openstack-nova-serialproxy'
       $spicehtml5proxy_package_name      = 'openstack-nova-console'
-      $ceph_client_package_name          = 'ceph-common'
+      $ceph_common_package_name          = 'ceph-common'
       $ovmf_package_name                 = 'edk2-ovmf'
       $swtpm_package_name                = 'swtpm'
       # service names
@@ -77,7 +77,7 @@ class nova::params {
       $libvirt_package_name              = 'libvirt-daemon-system'
       $libvirt_client_package_name       = 'libvirt-clients'
       $scheduler_package_name            = 'nova-scheduler'
-      $ceph_client_package_name          = 'ceph-common'
+      $ceph_common_package_name          = 'ceph-common'
       $ovmf_package_name                 = 'ovmf'
       $swtpm_package_name                = 'swtpm'
       # service names
diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb
index 67c9627a1..479105a8d 100644
--- a/spec/classes/nova_compute_rbd_spec.rb
+++ b/spec/classes/nova_compute_rbd_spec.rb
@@ -44,10 +44,9 @@ describe 'nova::compute::rbd' do
     end
 
     it 'installs client package' do
-      is_expected.to contain_package('ceph-client-package').with(
-        'name'   => platform_params[:ceph_client_package],
-        'ensure' => 'present',
-        'tag'    => ['openstack', 'nova-support-package']
+      is_expected.to contain_package('ceph-common').with(
+        'name'   => platform_params[:ceph_common_package],
+        'ensure' => 'installed',
       )
     end
 
@@ -128,7 +127,7 @@ describe 'nova::compute::rbd' do
         )
       end
 
-      it { is_expected.to_not contain_package('ceph-client-package') }
+      it { is_expected.to_not contain_package('ceph-common') }
     end
   end
 
@@ -158,9 +157,9 @@ describe 'nova::compute::rbd' do
       let (:platform_params) do
         case facts[:os]['family']
         when 'Debian'
-          { :ceph_client_package => 'ceph-common' }
+          { :ceph_common_package => 'ceph-common' }
         when 'RedHat'
-          { :ceph_client_package => 'ceph-common' }
+          { :ceph_common_package => 'ceph-common' }
         end
       end
       it_configures 'nova::compute::rbd'