diff --git a/manifests/backend/dellemc_powermax.pp b/manifests/backend/dellemc_powermax.pp index 84ae02ba..423b6f8c 100644 --- a/manifests/backend/dellemc_powermax.pp +++ b/manifests/backend/dellemc_powermax.pp @@ -67,6 +67,7 @@ define cinder::backend::dellemc_powermax ( ) { include cinder::deps + include cinder::params if $powermax_storage_protocol == 'iSCSI' { $volume_driver = 'cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver' diff --git a/spec/defines/cinder_backend_dellemc_powermax_spec.rb b/spec/defines/cinder_backend_dellemc_powermax_spec.rb index 4ed4ddcb..e94dcdb7 100644 --- a/spec/defines/cinder_backend_dellemc_powermax_spec.rb +++ b/spec/defines/cinder_backend_dellemc_powermax_spec.rb @@ -30,6 +30,12 @@ describe 'cinder::backend::dellemc_powermax' do is_expected.to contain_cinder_config("#{title}/powermax_srp").with_value('SRP_1') is_expected.to contain_cinder_config("#{title}/powermax_port_groups").with_value('[OS-ISCSI-PG]') is_expected.to contain_cinder_config("#{title}/backend_availability_zone").with_value('') + + is_expected.to contain_package('pywbem').with( + :ensure => 'installed', + :name => platform_params[:pywbem_package_name], + :tag => 'cinder-support-package', + ) end end @@ -95,6 +101,19 @@ describe 'cinder::backend::dellemc_powermax' do facts.merge!(OSDefaults.get_facts()) end + let :platform_params do + case facts[:os]['family'] + when 'Debian' + { + :pywbem_package_name => 'python-pywbem' + } + when 'RedHat' + { + :pywbem_package_name => 'pywbem' + } + end + end + it_behaves_like 'cinder::backend::dellemc_powermax' end end