stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Expose glance rbd parameters in openstack::controller"

Browse Source
This commit is contained in:
Jenkins
2013-08-14 18:38:58 +00:00
committed by Gerrit Code Review
parent 4fece87ecc 0815d45fa8
commit 4b81bd294a
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

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

18
spec/classes/openstack_controller_spec.rb
View File

@@ -376,6 +376,9 @@ describe 'openstack::controller' do
:sql_idle_timeout => '30', :sql_idle_timeout => '30',
:glance_db_user => 'dan', :glance_db_user => 'dan',
:glance_db_dbname => 'name', :glance_db_dbname => 'name',
:glance_backend => 'rbd',
:glance_rbd_store_user => 'myuser',
:glance_rbd_store_pool => 'mypool',
:db_host => '127.0.0.2' :db_host => '127.0.0.2'
) )
end end
@@ -408,6 +411,21 @@ describe 'openstack::controller' do
) )
end end
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 end
context 'config for nova' do context 'config for nova' do