diff --git a/manifests/backend/multistore/rbd.pp b/manifests/backend/multistore/rbd.pp index f6fd2c85..9f74a4fa 100644 --- a/manifests/backend/multistore/rbd.pp +++ b/manifests/backend/multistore/rbd.pp @@ -81,11 +81,11 @@ define glance::backend::multistore::rbd( "${name}/store_description": value => $store_description; } - if $manage_packages and !defined(Package["${::glance::params::pyceph_package_name}"]) { - ensure_resource('package', 'python-ceph', { + if $manage_packages and !defined(Package[$::glance::params::pyceph_package_name]) { + ensure_packages('python-ceph', { ensure => $package_ensure, name => $::glance::params::pyceph_package_name, - tag => 'glance-support-package', + tag => ['openstack', 'glance-support-package'], }) } } diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb index eac78a04..7cf52cc4 100644 --- a/spec/classes/glance_backend_rbd_spec.rb +++ b/spec/classes/glance_backend_rbd_spec.rb @@ -13,7 +13,7 @@ describe 'glance::backend::rbd' do it { should contain_package('python-ceph').with( :name => platform_params[:pyceph_package_name], - :ensure => 'present' + :ensure => 'installed' )} end diff --git a/spec/defines/glance_backend_multistore_rbd_spec.rb b/spec/defines/glance_backend_multistore_rbd_spec.rb index ef1e1875..7b2416ed 100644 --- a/spec/defines/glance_backend_multistore_rbd_spec.rb +++ b/spec/defines/glance_backend_multistore_rbd_spec.rb @@ -33,7 +33,8 @@ describe 'glance::backend::multistore::rbd' do it { should contain_package('python-ceph').with( :name => platform_params[:pyceph_package_name], - :ensure => 'present' + :ensure => 'installed', + :tag => ['openstack', 'glance-support-package'] )} end @@ -57,7 +58,8 @@ describe 'glance::backend::multistore::rbd' do it { should contain_package('python-ceph').with( :name => platform_params[:pyceph_package_name], - :ensure => 'latest' + :ensure => 'latest', + :tag => ['openstack', 'glance-support-package'] )} end