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

Merge "Fix the RBD driver class reference"

Browse Source
This commit is contained in:
Jenkins
2014-01-31 06:28:41 +00:00
committed by Gerrit Code Review
parent 59c1955caf 62a6d8ed9a
commit 3cc1b69377
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/volume.rb
View File

@@ -55,7 +55,7 @@ case node['openstack']['block-storage']['volume']['driver']
when 'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver' when 'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver'
node.override['openstack']['block-storage']['netapp']['dfm_password'] = get_password 'service', 'netapp' node.override['openstack']['block-storage']['netapp']['dfm_password'] = get_password 'service', 'netapp'
when 'cinder.volume.drivers.RBDDriver' when 'cinder.volume.drivers.rbd.RBDDriver'
node.override['openstack']['block-storage']['rbd_secret_uuid'] = get_password 'service', 'rbd' node.override['openstack']['block-storage']['rbd_secret_uuid'] = get_password 'service', 'rbd'
when 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver' when 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'

2
spec/api_spec.rb
View File

@@ -82,7 +82,7 @@ describe 'openstack-block-storage::api' do
it 'has rbd driver settings' do it 'has rbd driver settings' do
chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n| chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
n.set['openstack']['block-storage']['volume'] = { n.set['openstack']['block-storage']['volume'] = {
'driver' => 'cinder.volume.drivers.RBDDriver' 'driver' => 'cinder.volume.drivers.rbd.RBDDriver'
} }
end end
chef_run.converge 'openstack-block-storage::api' chef_run.converge 'openstack-block-storage::api'

2
spec/volume_spec.rb
View File

@@ -79,7 +79,7 @@ describe 'openstack-block-storage::volume' do
::Chef::Recipe.any_instance.stub(:get_password).with('service', 'rbd') ::Chef::Recipe.any_instance.stub(:get_password).with('service', 'rbd')
.and_return 'rbd-pass' .and_return 'rbd-pass'
chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n| chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.RBDDriver' n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.rbd.RBDDriver'
end end
chef_run.converge 'openstack-block-storage::volume' chef_run.converge 'openstack-block-storage::volume'
n = chef_run.node['openstack']['block-storage']['rbd_secret_uuid'] n = chef_run.node['openstack']['block-storage']['rbd_secret_uuid']

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

@@ -557,7 +557,7 @@ iscsi_ip_address=<%= node["openstack"]["block-storage"]["volume"]["iscsi_ip_addr
iscsi_port=<%= node["openstack"]["block-storage"]["volume"]["iscsi_port"] %> iscsi_port=<%= node["openstack"]["block-storage"]["volume"]["iscsi_port"] %>
#### (IntOpt) The port that the iSCSI daemon is listening on #### (IntOpt) The port that the iSCSI daemon is listening on
<% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.RBDDriver" %> <% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.rbd.RBDDriver" %>
rbd_pool=<%= node["openstack"]["block-storage"]["rbd_pool"] %> rbd_pool=<%= node["openstack"]["block-storage"]["rbd_pool"] %>
#### (StrOpt) the RADOS pool in which rbd volumes are stored #### (StrOpt) the RADOS pool in which rbd volumes are stored