x/compass-adapters
Code Issues Proposed changes

fixed a volume bug when assign a not existing disk

Browse Source 
Change-Id: Iaa6d0faffbd3fdc79ee4931bd5ec61daa685db27
This commit is contained in:
SamSu 2014-03-28 12:00:07 -07:00
parent 9f27829f52
commit 697caf28e8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chef/cookbooks/openstack-block-storage/providers/volume.rb
View File

@ -136,16 +136,20 @@ def create_disk_partition resource
end end
action :create_partition do action :create_partition do
if node['partitions'].nil? or not node['partitions'].any?{|s| s.include?(new_resource.device)} if ::File.exist?(new_resource.device)
disk_total_size new_resource if node['partitions'].nil? or not node['partitions'].any?{|s| s.include?(new_resource.device)}
partition_start_size new_resource disk_total_size new_resource
if new_resource.start_size.eql?(new_resource.total_size) partition_start_size new_resource
create_file_partition new_resource if new_resource.start_size.eql?(new_resource.total_size)
else create_file_partition new_resource
create_disk_partition new_resource else
create_disk_partition new_resource
end
end end
new_resource.updated_by_last_action(true) else
create_file_partition new_resource
end end
new_resource.updated_by_last_action(true)
end end
action :mk_cinder_vol do action :mk_cinder_vol do