Merge pull request #3410 from brandondunne/openstack_bdm_v2_add_volume_size

[Openstack|Servers|Create] Allow :volume_size in block_device_mapping_v2
This commit is contained in:
Wesley Beary 2015-01-25 18:33:22 -06:00
Родитель f9a3e5b671 12ab8dabd0
Коммит d0f6c0d6e3
2 изменённых файлов: 3 добавлений и 0 удалений

Просмотреть файл

@ -66,6 +66,7 @@ module Fog
'device_name' => mapping[:device_name],
'source_type' => mapping[:source_type],
'uuid' => mapping[:uuid],
'volume_size' => mapping[:volume_size],
}
end
elsif (block_device_mapping = options['block_device_mapping'])

Просмотреть файл

@ -84,6 +84,7 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
:source_type => "volume",
:destination_type => "volume",
:delete_on_termination => true,
:volume_size => 20
}, {
:boot_index => 1,
:uuid => @volume2_id,
@ -91,6 +92,7 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
:source_type => "volume",
:destination_type => "volume",
:delete_on_termination => true,
:volume_size => 10
}]
data = compute.create_server("test", nil, @flavor_id, "block_device_mapping_v2" => volume_data).body['server']
@server_id = data['id']