From 0815d45fa802b9d9086e9b2e101b7d159224f56d Mon Sep 17 00:00:00 2001 From: Francois Deppierraz Date: Sun, 11 Aug 2013 01:57:25 +0200 Subject: [PATCH] Expose glance rbd parameters in openstack::controller Change-Id: Ied2bb87e60f65a5524354869019f7012e0cc8fc1 --- manifests/controller.pp | 4 ++++ spec/classes/openstack_controller_spec.rb | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/manifests/controller.pp b/manifests/controller.pp index caac303..873fd93 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -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, } diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb index 9974afe..ea311be 100644 --- a/spec/classes/openstack_controller_spec.rb +++ b/spec/classes/openstack_controller_spec.rb @@ -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