openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Update Storewize/SVC driver name 

The Storewize/SVC driver name changed as a result of change
I1696a97279efe834a96b3f3843bc65f0ea6da9cc. This patch simply updates the
name.

Change-Id: I4d2aa3d828b9f61f237dbf12c2e199e57f3f06f7
Closes-Bug: #1311200
This commit is contained in:
Luis A. Garcia 2014-04-22 09:19:18 -07:00
parent e5beee63c1
commit 58e68ad565
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/volume.rb
View File

@ -111,7 +111,7 @@ when 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'
end
end
when 'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver'
when 'cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver'
file node['openstack']['block-storage']['san']['san_private_key'] do
mode '0400'
owner node['openstack']['block-storage']['user']

2
spec/volume_spec.rb
View File

@ -164,7 +164,7 @@ describe 'openstack-block-storage::volume' do
context 'Storewize Driver' do
let(:file) { chef_run.template('/etc/cinder/cinder.conf') }
before do
node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver'
node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver'
end
it 'configures storewize private key' do

4
templates/default/cinder.conf.erb
View File

@ -703,7 +703,7 @@ nfs_sparsed_volumes=<%= node["openstack"]["block-storage"]["ibmnas"]["nfs_sparse
######## defined in cinder.volume.san ########
<% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.storwize_svc.StorwizeSVCDriver" %>
<% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver" %>
san_ip=<%= node["openstack"]["block-storage"]["storwize"]["san_ip"] %>
#### (StrOpt) IP address of SAN controller
@ -764,7 +764,7 @@ iscsi_ip_prefix=<%= node["openstack"]["block-storage"]["solidfire"]["iscsi_ip_pr
<% end %>
#### (BoolOpt) Allow tenants to specify QOS on create
<% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.storwize_svc.StorwizeSVCDriver" %>
<% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver" %>
######## defined in cinder.volume.storwize_svc ########
storwize_svc_volpool_name=<%= node["openstack"]["block-storage"]["storwize"]["storwize_svc_volpool_name"] %>