Simplify package management

Currently all packages are defined using ensure_resource but it is
redundant because we don't expect these aodh packages are managed
outside of puppet-aodh. This replaces usage of ensure_resource by
the normal package resource, to make implementations more simple.

Change-Id: I0a92669b2f9a41e10a49c7db0865343453045c7b

manifests/evaluator.pp

@@ -50,10 +50,11 @@ class aodh::evaluator (
     'evaluator/workers'           : value => $workers;
   }
 
-  ensure_resource( 'package', [$::aodh::params::evaluator_package_name],
-    { ensure => $package_ensure,
-      tag    => ['openstack', 'aodh-package'] }
-  )
+  package { 'aodh-evaluator':
+    ensure => $package_ensure,
+    name   => $::aodh::params::evaluator_package_name,
+    tag    => ['openstack', 'aodh-package'],
+  }
 
   if $manage_service {
     if $enabled {

manifests/expirer.pp

@@ -53,10 +53,11 @@ class aodh::expirer (
   include aodh::params
   include aodh::deps
 
-  ensure_resource( 'package', [$::aodh::params::expirer_package_name],
-    { ensure => $package_ensure,
-      tag    => ['openstack', 'aodh-package'] }
-  )
+  package { 'aodh-expirer':
+    ensure => $package_ensure,
+    name   => $::aodh::params::expirer_package_name,
+    tag    => ['openstack', 'aodh-package']
+  }
 
   if $maxdelay == 0 {
     $sleep = ''

manifests/listener.pp

@@ -31,10 +31,11 @@ class aodh::listener (
     'listener/workers': value => $workers
   }
 
-  ensure_resource( 'package', [$::aodh::params::listener_package_name],
-    { ensure => $package_ensure,
-      tag    => ['openstack', 'aodh-package'] }
-  )
+  package { 'aodh-listener':
+    ensure => $package_ensure,
+    name   => $::aodh::params::listener_package_name,
+    tag    => ['openstack', 'aodh-package']
+  }
 
   if $manage_service {
     if $enabled {

manifests/notifier.pp

@@ -45,10 +45,11 @@ class aodh::notifier (
     'notifier/batch_timeout': value => $batch_timeout
   }
 
-  ensure_resource( 'package', [$::aodh::params::notifier_package_name],
-    { ensure => $package_ensure,
-      tag    => ['openstack', 'aodh-package'] }
-  )
+  package { 'aodh-notifier':
+    ensure => $package_ensure,
+    name   => $::aodh::params::notifier_package_name,
+    tag    => ['openstack', 'aodh-package']
+  }
 
   if $manage_service {
     if $enabled {

spec/classes/aodh_evaluator_spec.rb

@@ -48,8 +48,9 @@ describe 'aodh::evaluator' do
       it { is_expected.to contain_class('aodh::params') }
 
       it 'installs aodh-evaluator package' do
-        is_expected.to contain_package(platform_params[:evaluator_package_name]).with(
+        is_expected.to contain_package('aodh-evaluator').with(
           :ensure => 'present',
+          :name   => platform_params[:evaluator_package_name],
           :tag    => ['openstack', 'aodh-package']
         )
       end

spec/classes/aodh_expirer_spec.rb

@@ -12,8 +12,9 @@ describe 'aodh::expirer' do
       it { is_expected.to contain_aodh_config('database/alarm_histories_delete_batch_size').with_value('<SERVICE DEFAULT>') }
 
       it 'installs aodh-expirer package' do
-        is_expected.to contain_package(platform_params[:expirer_package_name]).with(
+        is_expected.to contain_package('aodh-expirer').with(
           :ensure => 'present',
+          :name   => platform_params[:expirer_package_name],
           :tag    => ['openstack', 'aodh-package']
         )
       end
@@ -46,8 +47,9 @@ describe 'aodh::expirer' do
       it { is_expected.to contain_aodh_config('database/alarm_histories_delete_batch_size').with_value(500) }
 
       it 'installs aodh-expirer package' do
-        is_expected.to contain_package(platform_params[:expirer_package_name]).with(
+        is_expected.to contain_package('aodh-expirer').with(
           :ensure => 'present',
+          :name   => platform_params[:expirer_package_name],
           :tag    => ['openstack', 'aodh-package']
         )
       end

spec/classes/aodh_listener_spec.rb

@@ -22,8 +22,9 @@ describe 'aodh::listener' do
       it { is_expected.to contain_class('aodh::params') }
 
       it 'installs aodh-listener package' do
-        is_expected.to contain_package(platform_params[:listener_package_name]).with(
+        is_expected.to contain_package('aodh-listener').with(
           :ensure => 'present',
+          :name   => platform_params[:listener_package_name],
           :tag    => ['openstack', 'aodh-package']
         )
       end

spec/classes/aodh_notifier_spec.rb

@@ -36,8 +36,9 @@ describe 'aodh::notifier' do
       it { is_expected.to contain_class('aodh::params') }
 
       it 'installs aodh-notifier package' do
-        is_expected.to contain_package(platform_params[:notifier_package_name]).with(
+        is_expected.to contain_package('aodh-notifier').with(
           :ensure => 'present',
+          :name   => platform_params[:notifier_package_name],
           :tag    => ['openstack', 'aodh-package']
         )
       end