From 1eb43b2b9740f3f8afad1330d7749a91e9568a4c Mon Sep 17 00:00:00 2001
From: rajinir <rajini_ram@dell.com>
Date: Thu, 9 Nov 2017 11:44:55 -0600
Subject: [PATCH] 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
---
 manifests/backend/dellemc_vmax_iscsi.pp              | 5 +++++
 manifests/params.pp                                  | 2 ++
 releasenotes/notes/vmax-driver-d428e372280c44e6.yaml | 5 +++++
 spec/defines/cinder_backend_dellemc_vmax_spec.rb     | 1 +
 4 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/vmax-driver-d428e372280c44e6.yaml

diff --git a/manifests/backend/dellemc_vmax_iscsi.pp b/manifests/backend/dellemc_vmax_iscsi.pp
index 9443c27c..b734e97b 100644
--- a/manifests/backend/dellemc_vmax_iscsi.pp
+++ b/manifests/backend/dellemc_vmax_iscsi.pp
@@ -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)
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 33ac6a7d..d1cf64b7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -27,6 +27,7 @@ class cinder::params {
     $lio_package_name          = 'targetcli'
     $lock_path                 = '/var/lock/cinder'
     $cinder_wsgi_script_path   = '/usr/lib/cgi-bin/cinder'
+    $pywbem_package_name       = 'python-pywbem'
 
   } elsif($::osfamily == 'RedHat') {
 
@@ -47,6 +48,7 @@ class cinder::params {
     $lio_package_name          = 'targetcli'
     $lock_path                 = '/var/lib/cinder/tmp'
     $cinder_wsgi_script_path   = '/var/www/cgi-bin/cinder'
+    $pywbem_package_name       = 'pywbem'
 
     case $::operatingsystem {
       'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {
diff --git a/releasenotes/notes/vmax-driver-d428e372280c44e6.yaml b/releasenotes/notes/vmax-driver-d428e372280c44e6.yaml
new file mode 100644
index 00000000..1f59bdd7
--- /dev/null
+++ b/releasenotes/notes/vmax-driver-d428e372280c44e6.yaml
@@ -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.
diff --git a/spec/defines/cinder_backend_dellemc_vmax_spec.rb b/spec/defines/cinder_backend_dellemc_vmax_spec.rb
index 2de97cef..b75fd8fc 100644
--- a/spec/defines/cinder_backend_dellemc_vmax_spec.rb
+++ b/spec/defines/cinder_backend_dellemc_vmax_spec.rb
@@ -16,6 +16,7 @@ describe 'cinder::backend::dellemc_vmax_iscsi' do
 
   describe '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/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
     end