stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Glance: configure identity_uri parameter

Browse Source 
In Juno, this parameter is required otherwise Glance can't
authentificate against Keystone.
There is a patch in puppet-glance:
https://review.openstack.org/#/c/133521/ but not merged yet (still under
discussion). In the meantime, let's fix it in the composition layer.

Change-Id: I8ab9ab365ad5c9266c9e71054d8b43ecbaef50ac
This commit is contained in:
Emilien Macchi 2015-01-19 17:14:26 -05:00
parent 2db5e1b984
commit 7748787f2d
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/image/api.pp
View File

@ -211,6 +211,8 @@ class cloud::image::api(
# } # }
glance_api_config { glance_api_config {
'DEFAULT/notifier_driver': value => 'noop'; 'DEFAULT/notifier_driver': value => 'noop';
# TODO(EmilienM) Drop this line when https://review.openstack.org/#/c/133521/ has been merged.
'keystone_authtoken/identity_uri': value => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:35357";
} }
if ($backend == 'rbd') { if ($backend == 'rbd') {

5
manifests/image/registry.pp
View File

@ -131,6 +131,11 @@ class cloud::image::registry(
log_facility => $log_facility, log_facility => $log_facility,
} }
glance_registry_config {
# TODO(EmilienM) Drop this line when https://review.openstack.org/#/c/133521/ been merged.
'keystone_authtoken/identity_uri': value => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:35357";
}
exec {'glance_db_sync': exec {'glance_db_sync':
command => 'glance-manage db_sync', command => 'glance-manage db_sync',
user => 'glance', user => 'glance',

1
spec/classes/cloud_image_api_spec.rb
View File

@ -85,6 +85,7 @@ describe 'cloud::image::api' do
# ) # )
# end # end
it { is_expected.to contain_glance_api_config('DEFAULT/notifier_driver').with_value('noop') } it { is_expected.to contain_glance_api_config('DEFAULT/notifier_driver').with_value('noop') }
it { is_expected.to contain_glance_api_config('keystone_authtoken/identity_uri').with_value('https://10.0.0.1:35357') }
it 'configure glance rbd backend' do it 'configure glance rbd backend' do
is_expected.to contain_class('glance::backend::rbd').with( is_expected.to contain_class('glance::backend::rbd').with(

2
spec/classes/cloud_image_registry_spec.rb
View File

@ -57,6 +57,8 @@ describe 'cloud::image::registry' do
) )
end end
it { is_expected.to contain_glance_registry_config('keystone_authtoken/identity_uri').with_value('https://10.0.0.1:35357') }
it 'checks if Glance DB is populated' do it 'checks if Glance DB is populated' do
is_expected.to contain_exec('glance_db_sync').with( is_expected.to contain_exec('glance_db_sync').with(
:command => 'glance-manage db_sync', :command => 'glance-manage db_sync',