diff --git a/manifests/backend/iscsi.pp b/manifests/backend/iscsi.pp index d581866c..8d48278e 100644 --- a/manifests/backend/iscsi.pp +++ b/manifests/backend/iscsi.pp @@ -70,12 +70,10 @@ define cinder::backend::iscsi ( # NOTE(mnaser): Cinder requires /usr/sbin/thin_check to create volumes which # does not get installed with Cinder (see LP#1615134). if $facts['os']['family'] == 'Debian' { - if ! defined(Package['thin-provisioning-tools']) { - package { 'thin-provisioning-tools': - ensure => present, - tag => 'cinder-support-package', - } - } + ensure_packages( 'thin-provisioning-tools', { + ensure => present, + tag => 'cinder-support-package', + }) } cinder_config { diff --git a/manifests/backend/nvmeof.pp b/manifests/backend/nvmeof.pp index cc442e40..7122768b 100644 --- a/manifests/backend/nvmeof.pp +++ b/manifests/backend/nvmeof.pp @@ -95,16 +95,16 @@ define cinder::backend::nvmeof ( "${name}/target_secondary_ip_addresses": value => join(any2array($target_secondary_ip_addresses), ','); } - package { 'nvmetcli': + ensure_packages ( 'nvmetcli', { ensure => present, name => 'nvmetcli', tag => 'cinder-support-package', - } + }) - package { 'nvme-cli': + ensure_packages ( 'nvme-cli', { ensure => present, name => 'nvme-cli', tag => 'cinder-support-package', - } + }) } diff --git a/manifests/backend/vstorage.pp b/manifests/backend/vstorage.pp index 8f25d837..f8c47cc5 100644 --- a/manifests/backend/vstorage.pp +++ b/manifests/backend/vstorage.pp @@ -109,10 +109,10 @@ define cinder::backend::vstorage ( } if $manage_package { - package { 'vstorage-client': + ensure_packages( 'vstorage-client', { ensure => present, tag => 'cinder-support-package', - } + }) } $mount_opts = ['-u', $mount_user_real, '-g', $mount_group, '-m', $mount_permissions] diff --git a/spec/defines/cinder_backend_nvmeof_spec.rb b/spec/defines/cinder_backend_nvmeof_spec.rb index faf8ea9b..302baad7 100644 --- a/spec/defines/cinder_backend_nvmeof_spec.rb +++ b/spec/defines/cinder_backend_nvmeof_spec.rb @@ -34,13 +34,13 @@ describe 'cinder::backend::nvmeof' do it { is_expected.to contain_package('nvmetcli').with( :name => 'nvmetcli', - :ensure => 'present', + :ensure => 'installed', :tag => 'cinder-support-package', )} it { is_expected.to contain_package('nvme-cli').with( :name => 'nvme-cli', - :ensure => 'present', + :ensure => 'installed', :tag => 'cinder-support-package', )} end diff --git a/spec/defines/cinder_backend_vstorage_spec.rb b/spec/defines/cinder_backend_vstorage_spec.rb index e13a8e55..b70e9f9c 100644 --- a/spec/defines/cinder_backend_vstorage_spec.rb +++ b/spec/defines/cinder_backend_vstorage_spec.rb @@ -38,7 +38,10 @@ describe 'cinder::backend::vstorage' do :value => 'cinder.volume.drivers.vzstorage.VZStorageDriver' )} - it { is_expected.to contain_package('vstorage-client').with_ensure('present') } + it { is_expected.to contain_package('vstorage-client').with( + :ensure => 'installed', + :tag => 'cinder-support-package', + ) } it { is_expected.to contain_file('/etc/cinder/vstorage_shares.conf').with( :content => "stor1:passw0rd [\"-u\", \"cinder\", \"-g\", \"root\", \"-m\", \"0770\"]"