openstack/puppet-glance
Code Issues Proposed changes

Allow paste deploy flavor to be passed for glance api

Browse Source 
Some users may want to pass in one of
keystone, keystone+caching or keystone+cachemanagement
depending on their caching needs

Change-Id: Ia13cc2f1d8ec43074b114edf1b2366b85ca77aa0
This commit is contained in:
Derek Higgins 2013-04-26 05:48:39 -04:00
parent 1598196ae7
commit 3ade42f65e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/api.pp
View File

@ -50,6 +50,7 @@ class glance::api(
$auth_host = '127.0.0.1', $auth_host = '127.0.0.1',
$auth_port = '35357', $auth_port = '35357',
$auth_protocol = 'http', $auth_protocol = 'http',
$pipeline = 'keystone+cachemanagement',
$keystone_tenant = 'admin', $keystone_tenant = 'admin',
$keystone_user = 'admin', $keystone_user = 'admin',
$enabled = true, $enabled = true,
@ -136,7 +137,7 @@ class glance::api(
# keystone config # keystone config
if $auth_type == 'keystone' { if $auth_type == 'keystone' {
glance_api_config { glance_api_config {
'paste_deploy/flavor': value => 'keystone+cachemanagement'; 'paste_deploy/flavor': value => $pipeline;
'keystone_authtoken/admin_tenant_name': value => $keystone_tenant; 'keystone_authtoken/admin_tenant_name': value => $keystone_tenant;
'keystone_authtoken/admin_user': value => $keystone_user; 'keystone_authtoken/admin_user': value => $keystone_user;
'keystone_authtoken/admin_password': value => $keystone_password; 'keystone_authtoken/admin_password': value => $keystone_password;

12
spec/classes/glance_api_spec.rb
View File

@ -129,4 +129,16 @@ describe 'glance::api' do
end end
end end
end end
describe 'with overridden pipeline' do
let :params do
{
:keystone_password => 'ChangeMe',
:pipeline => 'keystone',
}
end
it { should contain_glance_api_config('paste_deploy/flavor').with_value('keystone') }
end
end end