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
This commit is contained in:
parent
317147f670
commit
1dd5ddb827
|
@ -117,12 +117,11 @@ class ceilometer::agent::notification (
|
||||||
$workers_real = $workers
|
$workers_real = $workers
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure_resource('package', [$::ceilometer::params::agent_notification_package_name],
|
package { 'ceilometer-notification':
|
||||||
{
|
ensure => $package_ensure,
|
||||||
ensure => $package_ensure,
|
name => $::ceilometer::params::agent_notification_package_name,
|
||||||
tag => ['openstack', 'ceilometer-package']
|
tag => ['openstack', 'ceilometer-package']
|
||||||
}
|
}
|
||||||
)
|
|
||||||
|
|
||||||
if $manage_service {
|
if $manage_service {
|
||||||
if $enabled {
|
if $enabled {
|
||||||
|
|
|
@ -37,8 +37,9 @@ describe 'ceilometer::agent::notification' do
|
||||||
it { is_expected.to contain_class('ceilometer::params') }
|
it { is_expected.to contain_class('ceilometer::params') }
|
||||||
|
|
||||||
it 'installs ceilometer agent notification package' do
|
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',
|
:ensure => 'present',
|
||||||
|
:name => platform_params[:agent_notification_package_name],
|
||||||
:tag => ['openstack', 'ceilometer-package'],
|
:tag => ['openstack', 'ceilometer-package'],
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue