stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Multi-Backend follow-up

Browse Source 
- Update fixtures.yml to stable/havana
- Transform configuration hash
- Allow multiple backends with same driver
- Improve unit tests

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-03-18 15:15:46 +01:00
parent 4b80f42930
commit 76eadfa9d2
7 changed files with 356 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
spec/classes/cloud_volume_storage_spec.rb
View File

@@ -122,6 +122,56 @@ describe 'cloud::volume::storage' do
end
end
# This context can't work now, because of https://bugs.launchpad.net/puppet-cinder/+bug/1294138
# context 'with two RBD backends' do
# before :each do
# params.merge!(
# :cinder_backends => {
# 'rbd' => {
# 'lowcost' => {
# 'rbd_pool' => 'low',
# 'rbd_user' => 'cinder',
# 'rbd_secret_uuid' => 'secret',
# },
# 'normal' => {
# 'rbd_pool' => 'normal',
# 'rbd_user' => 'cinder',
# 'rbd_secret_uuid' => 'secret',
# }
# }
# }
# )
# end
#
#
# it 'configures two rbd volume backends' do
# should contain_cinder_config('lowcost/volume_backend_name').with_value('lowcost')
# should contain_cinder_config('lowcost/rbd_pool').with_value('low')
# should contain_cinder_config('lowcost/rbd_user').with_value('cinder')
# should contain_cinder_config('lowcost/rbd_secret_uuid').with_value('secret')
# should contain_cinder__type('lowcost').with(
# :set_key => 'volume_backend_name',
# :set_value => 'lowcost',
# :os_tenant_name => 'services',
# :os_username => 'cinder',
# :os_password => 'secret',
# :os_auth_url => 'http://keystone.host:5000/v2.0'
# )
# should contain_cinder_config('normal/volume_backend_name').with_value('normal')
# should contain_cinder_config('normal/rbd_pool').with_value('normal')
# should contain_cinder_config('normal/rbd_user').with_value('cinder')
# should contain_cinder_config('normal/rbd_secret_uuid').with_value('secret')
# should contain_cinder__type('normal').with(
# :set_key => 'volume_backend_name',
# :set_value => 'normal',
# :os_tenant_name => 'services',
# :os_username => 'cinder',
# :os_password => 'secret',
# :os_auth_url => 'http://keystone.host:5000/v2.0'
# )
# end
# end
context 'with all backends enabled' do
it 'configure all cinder backends' do
should contain_class('cinder::backends').with(
@@ -143,8 +193,7 @@ describe 'cloud::volume::storage' do
:rbd_secret_uuid => 'secret',
:rbd_ceph_conf => '/etc/ceph/ceph.conf',
:rbd_flatten_volume_from_snapshot => false,
:rbd_max_clone_depth => '10',
:glance_api_version => '2'
:rbd_max_clone_depth => '10'
)
end
end