From 62a6d8ed9a0eb666c087fc56e0b5cc1643f77588 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Fri, 24 Jan 2014 14:44:35 +0100 Subject: [PATCH] Fix the RBD driver class reference The reference for the RBD driver class was wrong. It was fixed in all places. blueprint rbd-for-block-storage Change-Id: Ie91fd2d41b82120673c0b579230228c2f6dc79e3 --- recipes/volume.rb | 2 +- spec/api_spec.rb | 2 +- spec/volume_spec.rb | 2 +- templates/default/cinder.conf.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/volume.rb b/recipes/volume.rb index 538c2ee..2f2e1a5 100644 --- a/recipes/volume.rb +++ b/recipes/volume.rb @@ -55,7 +55,7 @@ case node['openstack']['block-storage']['volume']['driver'] when 'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver' 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' when 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver' diff --git a/spec/api_spec.rb b/spec/api_spec.rb index 2bf467e..b6801a2 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -82,7 +82,7 @@ describe 'openstack-block-storage::api' do it 'has rbd driver settings' do chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n| n.set['openstack']['block-storage']['volume'] = { - 'driver' => 'cinder.volume.drivers.RBDDriver' + 'driver' => 'cinder.volume.drivers.rbd.RBDDriver' } end chef_run.converge 'openstack-block-storage::api' diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 862bc7b..c177e66 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -79,7 +79,7 @@ describe 'openstack-block-storage::volume' do ::Chef::Recipe.any_instance.stub(:get_password).with('service', 'rbd') .and_return 'rbd-pass' 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 chef_run.converge 'openstack-block-storage::volume' n = chef_run.node['openstack']['block-storage']['rbd_secret_uuid'] diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb index 9c844fc..fd46956 100644 --- a/templates/default/cinder.conf.erb +++ b/templates/default/cinder.conf.erb @@ -557,7 +557,7 @@ iscsi_ip_address=<%= node["openstack"]["block-storage"]["volume"]["iscsi_ip_addr iscsi_port=<%= node["openstack"]["block-storage"]["volume"]["iscsi_port"] %> #### (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"] %> #### (StrOpt) the RADOS pool in which rbd volumes are stored