openstack
/
puppet-glance
Code Issues Proposed changes

Ensure keystone endpoint set before service starts 

This patch ensures that in the case where keystone and
glance-api are on the same node, nova-api is not started
until the keystone catalog contains the image service
and endpoint required to use glance.

Change-Id: I48ae07b2d7789d549a4412a21e842a1222a48caa
This commit is contained in:
Michael Chapman 2013-10-30 15:45:21 +11:00
parent 93ebf43ea4
commit cabf6d6b6c
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/keystone/auth.pp
View File

@ -31,6 +31,7 @@ class glance::keystone::auth(
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-registry' |>
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-api' |>
Keystone_endpoint["${region}/${auth_name}"] ~> Service <| name == 'glance-api' |>
keystone_user { $auth_name:
ensure => present,

18
spec/classes/glance_keystone_auth_spec.rb
View File

@ -95,4 +95,22 @@ describe 'glance::keystone::auth' do
it { should_not contain_keystone_endpoint('glance') }
end
describe 'when configuring glance-api and the keystone endpoint' do
let :pre_condition do
"class { 'glance::api': keystone_password => 'test' }"
end
let :facts do
{ :osfamily => 'Debian' }
end
let :params do
{
:password => 'test',
:configure_endpoint => true
}
end
it { should contain_keystone_endpoint('RegionOne/glance').with_notify('Service[glance-api]') }
end
end