stackforge/puppet-openstack
Code Issues Proposed changes

Expose glance rbd parameters in openstack::controller

Browse Source 
Change-Id: Ied2bb87e60f65a5524354869019f7012e0cc8fc1
This commit is contained in:
Francois Deppierraz
2013-08-11 01:57:25 +02:00
parent c57bf80e60
commit 0815d45fa8
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/controller.pp
View File

@@ -172,6 +172,8 @@ class openstack::controller (
$glance_db_dbname = 'glance',
$glance_api_servers = undef,
$glance_backend = 'file',
$glance_rbd_store_user = undef,
$glance_rbd_store_pool = undef,
# Glance Swift Backend
$swift_store_user = 'swift_store_user',
$swift_store_key = 'swift_store_key',
@@ -366,6 +368,8 @@ class openstack::controller (
backend => $glance_backend,
swift_store_user => $swift_store_user,
swift_store_key => $swift_store_key,
rbd_store_user => $glance_rbd_store_user,
rbd_store_pool => $glance_rbd_store_pool,
enabled => $enabled,
}

18
spec/classes/openstack_controller_spec.rb
View File

@@ -370,6 +370,9 @@ describe 'openstack::controller' do
:sql_idle_timeout => '30',
:glance_db_user => 'dan',
:glance_db_dbname => 'name',
:glance_backend => 'rbd',
:glance_rbd_store_user => 'myuser',
:glance_rbd_store_pool => 'mypool',
:db_host => '127.0.0.2'
)
end
@@ -402,6 +405,21 @@ describe 'openstack::controller' do
)
end
end
context 'when the RBD backend is configured' do
let :params do
default_params.merge(
:glance_backend => 'rbd',
:glance_rbd_store_user => 'myuser',
:glance_rbd_store_pool => 'mypool'
)
should contain_class('glance::backend::rbd').with(
:rbd_store_user => 'myuser',
:rbd_store_pool => 'mypool'
)
end
end
end
context 'config for nova' do