From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 24 Sep 2021 07:49:05 +0000 (+0900)
Subject: Use package resource directly
X-Git-Tag: 19.4.0~8
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1dd5ddb8273cb6d6e2af98a2c5529b1d185415cd;p=puppet-modules%2Fpuppet-ceilometer.git

Use package resource directly

... instead of using ensure_resource to define a package resource,
because it is not expected that ceilometer packages are managed outside
of puppet-ceilometer.

Change-Id: I541450707b64277b30d55f136d57b8cf4443cfd4
---

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 0c2eaad..cf9823f 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -117,12 +117,11 @@ class ceilometer::agent::notification (
     $workers_real = $workers
   }
 
-  ensure_resource('package', [$::ceilometer::params::agent_notification_package_name],
-    {
-      ensure => $package_ensure,
-      tag    => ['openstack', 'ceilometer-package']
-    }
-  )
+  package { 'ceilometer-notification':
+    ensure => $package_ensure,
+    name   => $::ceilometer::params::agent_notification_package_name,
+    tag    => ['openstack', 'ceilometer-package']
+  }
 
   if $manage_service {
     if $enabled {
diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index 39bbbac..633060d 100644
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -37,8 +37,9 @@ describe 'ceilometer::agent::notification' do
     it { is_expected.to contain_class('ceilometer::params') }
 
     it 'installs ceilometer agent notification package' do
-      is_expected.to contain_package(platform_params[:agent_notification_package_name]).with(
+      is_expected.to contain_package('ceilometer-notification').with(
         :ensure => 'present',
+        :name   => platform_params[:agent_notification_package_name],
         :tag    => ['openstack', 'ceilometer-package'],
       )
     end