From d4678e8a4764602151e72b622e1460d201aa374c Mon Sep 17 00:00:00 2001
From: xijiax <xijiax@cn.ibm.com>
Date: Tue, 28 Oct 2014 15:01:31 +0800
Subject: [PATCH] Add package sysfsutils for cinder SVC driver.

Change-Id: I4e2c997dc29e4c23b3d5cd006d81504cde840e09
Closes-Bug: #1386062
---
 CHANGELOG.md          | 1 +
 attributes/default.rb | 5 ++++-
 recipes/volume.rb     | 7 +++++++
 spec/volume_spec.rb   | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b8325f..5810619 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This file is used to list changes made in each version of the openstack-block-st
 * Update deprecated keystoneclient.middleware.auth_token in api-paste.ini
 * Add attributes for quota_snapshots, no_snapshot_gb_quota and use_default_quota_class
 * Add glance_api_insecure and make glance_api_servers to be prefixed with scheme
+* Add sysfsutils package for storwize/SVC driver
 
 ## 10.0.0
 * Upgrading to Juno
diff --git a/attributes/default.rb b/attributes/default.rb
index f8b945c..1285a69 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -306,6 +306,7 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
     'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
     'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
     'cinder_emc_packages' => ['pywbem'],
+    'cinder_svc_packages' => ['sysfsutils'],
     'package_overrides' => ''
   }
 when 'suse'
@@ -325,7 +326,8 @@ when 'suse'
     'cinder_iscsitarget_packages' => ['tgt'],
     'cinder_iscsitarget_service' => 'tgtd',
     'cinder_nfs_packages' => ['nfs-utils'],
-    'cinder_emc_packages' => ['python-pywbem']
+    'cinder_emc_packages' => ['python-pywbem'],
+    'cinder_svc_packages' => ['sysfsutils']
   }
 when 'debian'
   # operating system user and group names
@@ -345,6 +347,7 @@ when 'debian'
     'cinder_iscsitarget_service' => 'tgt',
     'cinder_nfs_packages' => ['nfs-common'],
     'cinder_emc_packages' => ['python-pywbem'],
+    'cinder_svc_packages' => ['sysfsutils'],
     'package_overrides' => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
   }
 end
diff --git a/recipes/volume.rb b/recipes/volume.rb
index 305e209..64f7970 100644
--- a/recipes/volume.rb
+++ b/recipes/volume.rb
@@ -118,6 +118,13 @@ when 'cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver'
     group node['openstack']['block-storage']['group']
   end
 
+  platform_options['cinder_svc_packages'].each do |pkg|
+    package pkg do
+      options platform_options['package_overrides']
+      action :upgrade
+    end
+  end
+
 when 'cinder.volume.drivers.gpfs.GPFSDriver'
   directory node['openstack']['block-storage']['gpfs']['gpfs_mount_point_base'] do
     mode '0755'
diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb
index da31db1..d3ae876 100644
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@@ -211,6 +211,10 @@ describe 'openstack-block-storage::volume' do
         )
       end
 
+      it 'upgrades svc package' do
+        expect(chef_run).to upgrade_package 'sysfsutils'
+      end
+
       context 'ISCSI' do
         before do
           node.set['openstack']['block-storage']['storwize']['storwize_svc_connection_protocol'] = 'iSCSI'