Dell EMC VMAX: Fixes driver dependency using ensure

VMAX cinder ISCSI driver requires python pywbem package.
The patch ensures the package to be installed

Closes Bug: #1731309

Change-Id: I9e09aa3ef572189ce875b96847e1d303fe8eb3b0
This commit is contained in:
rajinir 2017-11-09 11:44:55 -06:00
parent eb5ad47d5a
commit 1eb43b2b97
4 changed files with 13 additions and 0 deletions

View File

@ -53,6 +53,11 @@ define cinder::backend::dellemc_vmax_iscsi (
} }
} }
ensure_packages( 'pywbem', {
ensure => present,
name => $::cinder::param::pywbem_package_name,
tag => 'cinder-support-package'})
create_resources('cinder_config', $extra_options) create_resources('cinder_config', $extra_options)
} }

View File

@ -27,6 +27,7 @@ class cinder::params {
$lio_package_name = 'targetcli' $lio_package_name = 'targetcli'
$lock_path = '/var/lock/cinder' $lock_path = '/var/lock/cinder'
$cinder_wsgi_script_path = '/usr/lib/cgi-bin/cinder' $cinder_wsgi_script_path = '/usr/lib/cgi-bin/cinder'
$pywbem_package_name = 'python-pywbem'
} elsif($::osfamily == 'RedHat') { } elsif($::osfamily == 'RedHat') {
@ -47,6 +48,7 @@ class cinder::params {
$lio_package_name = 'targetcli' $lio_package_name = 'targetcli'
$lock_path = '/var/lib/cinder/tmp' $lock_path = '/var/lib/cinder/tmp'
$cinder_wsgi_script_path = '/var/www/cgi-bin/cinder' $cinder_wsgi_script_path = '/var/www/cgi-bin/cinder'
$pywbem_package_name = 'pywbem'
case $::operatingsystem { case $::operatingsystem {
'RedHat', 'CentOS', 'Scientific', 'OracleLinux': { 'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {

View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes `bug 1731309
<https://bugs.launchpad.net/puppet-cinder/+bug/1731309>`__
to ensure package dependency of pywben for VMAX driver.

View File

@ -16,6 +16,7 @@ describe 'cinder::backend::dellemc_vmax_iscsi' do
describe 'dell emc vmax iscsi volume driver' do describe 'dell emc vmax iscsi volume driver' do
it 'configure dell emc vmax iscsi volume driver' do it 'configure dell emc vmax iscsi volume driver' do
is_expected.to contain_package('pywbem').with(:ensure => :present)
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.emc.emc_vmax_iscsi.EMCVMAXISCSIDriver') is_expected.to contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.emc.emc_vmax_iscsi.EMCVMAXISCSIDriver')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml') is_expected.to contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
end end