From 0fd962dae2162405dc8b8ee04d7901b42e74a303 Mon Sep 17 00:00:00 2001 From: Masaki Matsushita Date: Mon, 4 May 2015 17:44:05 +0900 Subject: [PATCH] use LVMVolumeDriver as default. LVMISCSIDriver is deprecated. See also: cinder/volume/drivers/lvm.py Change-Id: I08b157ee7fbb0d61c8c9ec406edf2240a9a40c1d Closes-Bug: #1451363 --- README.md | 10 +++++----- attributes/default.rb | 2 +- recipes/volume.rb | 2 +- spec/cinder_common_spec.rb | 6 +++--- spec/volume-redhat_spec.rb | 2 +- spec/volume_spec.rb | 4 ++-- templates/default/cinder.conf.erb | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 47fa172..3a7356e 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,9 @@ scheduler volume ---- -- Installs the cinder-volume service, sets up the iscsi helper and create volume group when using the LVMISCSIDriver +- Installs the cinder-volume service, sets up the iscsi helper and create volume group when using the LVMVolumeDriver -Defaults to the ISCSI (LVM) Driver. +Defaults to the LVM Volume Driver. Attributes ========== @@ -108,13 +108,13 @@ Cinder attributes - **cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver** - IBM Storwize/SVC driver - **cinder.volume.drivers.ibm.gpfs.GPFSDriver** - IBM General Parallel File System driver - **cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver** - IBM Storwize V7000 Unified and IBM SONAS Cinder driver - - **cinder.volume.drivers.lvm.LVMISCSIDriver** - LVM Driver + - **cinder.volume.drivers.lvm.LVMVolumeDriver** - LVM Driver - **cinder.volume.drivers.emc.emc_smis_iscsi.EMCSMISISCSIDriver** - EMC SMI-S iSCSI Driver * `openstack["block-storage"]["volume"]["volume_clear"]` - Defines the method for clearing volumes on a volume delete possible options: 'zero', 'none', 'shred' (https://review.openstack.org/#/c/12521/) * `openstack["block-storage"]["volume"]["volume_clear_size"]` - size in MB used to limit the cleared area on deleting a volume, to the first part of the volume only. (default 0 = all MB) * `openstack["block-storage"]["volume"]["volume_group"]` - Name for the VG that will contain exported volumes * `openstack["block-storage"]["voluem"]["volume_group_size"]` - The size (GB) of volume group (default is 40) -* `openstack["block-storage"]["voluem"]["create_volume_group"]` - Create volume group or not when using the LVMISCSIDriver (default is false) +* `openstack["block-storage"]["voluem"]["create_volume_group"]` - Create volume group or not when using the LVMVolumeDriver (default is false) * `openstack["block-storage"]["volume"]["create_volume_group_type"]` - 'file' or 'block_devices'. Create volume group from block devices or just a file for testing * `openstack["block-storage"]["volume"]["block_devices"]` - String of blank separated block devices to use for creating volume group when type is 'block_devices' * `openstack["block-storage"]["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use @@ -202,7 +202,7 @@ Cinder attributes * `openstack['block-storage']['ibmnas']['ibmnas_platform_type']` - Platform type to be used as backend storage ### Multiple backends attributes ### -* `openstack['block-storage']['volume']['multi_backend']` - Hash map to indicate multiple backends sections, e.g. { 'lvm1' => { 'volume_driver' => 'cinder.volume.drivers.lvm.LVMISCSIDriver', 'volume_backend_name' => 'lvm1' }, 'lvm2' => { 'volume_driver' => 'cinder.volume.drivers.lvm.LVMISCSIDriver', 'volume_backend_name' => 'lvm2' } } +* `openstack['block-storage']['volume']['multi_backend']` - Hash map to indicate multiple backends sections, e.g. { 'lvm1' => { 'volume_driver' => 'cinder.volume.drivers.lvm.LVMVolumeDriver', 'volume_backend_name' => 'lvm1' }, 'lvm2' => { 'volume_driver' => 'cinder.volume.drivers.lvm.LVMVolumeDriver', 'volume_backend_name' => 'lvm2' } } * `default['openstack']['block-storage']['volume']['default_volume_type']` - String to indicate the volume_type that maps to one of the configured volume backends The following attributes are defined in attributes/default.rb of the common cookbook, but are documented here due to their relevance: diff --git a/attributes/default.rb b/attributes/default.rb index 348c265..fedda8b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -257,7 +257,7 @@ default['openstack']['block-storage']['cron']['audit_logfile'] = '/var/log/cinde default['openstack']['block-storage']['volume']['state_path'] = '/var/lib/cinder' default['openstack']['block-storage']['volume']['volumes_dir'] = '/var/lib/cinder/volumes' -default['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' +default['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver' default['openstack']['block-storage']['volume']['volume_group'] = 'cinder-volumes' default['openstack']['block-storage']['volume']['volume_group_size'] = 40 default['openstack']['block-storage']['volume']['volume_clear_size'] = 0 diff --git a/recipes/volume.rb b/recipes/volume.rb index b334848..a3592f9 100644 --- a/recipes/volume.rb +++ b/recipes/volume.rb @@ -169,7 +169,7 @@ when 'cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver' notifies :restart, 'service[cinder-volume]' end -when 'cinder.volume.drivers.lvm.LVMISCSIDriver' +when 'cinder.volume.drivers.lvm.LVMVolumeDriver' platform_options['cinder_lvm_packages'].each do |pkg| package pkg do diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb index 8ed5454..4227e16 100644 --- a/spec/cinder_common_spec.rb +++ b/spec/cinder_common_spec.rb @@ -437,7 +437,7 @@ describe 'openstack-block-storage::cinder-common' do context 'lvm settings' do before do - node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' + node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver' end %w(group clear clear_size).each do |attr| @@ -824,7 +824,7 @@ describe 'openstack-block-storage::cinder-common' do before do node.set['openstack']['block-storage']['volume']['multi_backend'] = { 'lvm' => { - 'volume_driver' => 'cinder.volume.drivers.lvm.LVMISCSIDriver', + 'volume_driver' => 'cinder.volume.drivers.lvm.LVMVolumeDriver', 'volume_backend_name' => 'lvmdrv' }, 'rbd' => { @@ -883,7 +883,7 @@ describe 'openstack-block-storage::cinder-common' do expect(chef_run).to render_file(file.name).with_content(/^enabled_backends = lvm,rbd,netapp_iscsi,netapp_nfs,ibmnas,ibmsvc,solidfire,emciscsi,vmware,gpfs$/) expect(chef_run).to render_file(file.name).with_content(/^\[lvm\]$/) - expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMISCSIDriver$/) + expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMVolumeDriver$/) expect(chef_run).to render_file(file.name).with_content(/^\[rbd\]$/) expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.rbd\.RBDDriver$/) diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb index 6fe3637..8327bc6 100644 --- a/spec/volume-redhat_spec.rb +++ b/spec/volume-redhat_spec.rb @@ -165,7 +165,7 @@ describe 'openstack-block-storage::volume' do describe 'create_vg' do let(:file) { chef_run.template('/etc/init.d/cinder-group-active') } before do - node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' + node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver' node.set['openstack']['block-storage']['volume']['create_volume_group'] = true stub_command('vgs cinder-volumes').and_return(false) end diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 548b795..2b38edf 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -238,7 +238,7 @@ describe 'openstack-block-storage::volume' do describe 'create_vg' do let(:file) { chef_run.template('/etc/init.d/cinder-group-active') } before do - node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' + node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver' node.set['openstack']['block-storage']['volume']['create_volume_group'] = true stub_command('vgs cinder-volumes').and_return(false) end @@ -295,7 +295,7 @@ describe 'openstack-block-storage::volume' do describe 'create vg on block devices' do before do - node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' + node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver' node.set['openstack']['block-storage']['volume']['create_volume_group'] = true node.set['openstack']['block-storage']['volume']['create_volume_group_type'] = 'block_devices' node.set['openstack']['block-storage']['volume']['block_devices'] = '/dev/sdx /dev/sdx1' diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb index 7c5af29..0e6edf6 100644 --- a/templates/default/cinder.conf.erb +++ b/templates/default/cinder.conf.erb @@ -420,7 +420,7 @@ max_gigabytes=<%= node["openstack"]["block-storage"]["max_gigabytes"] %> ######## defined in cinder.volume.driver ######## -<% if @enabled_drivers.include?("cinder.volume.drivers.lvm.LVMISCSIDriver") %> +<% if @enabled_drivers.include?("cinder.volume.drivers.lvm.LVMVolumeDriver") %> volume_group=<%= node["openstack"]["block-storage"]["volume"]["volume_group"] %> #### (StrOpt) Name for the VG that will contain exported volumes volume_clear=<%= node["openstack"]["block-storage"]["volume"]["volume_clear"] %>