From 7748787f2d6f81a787c3916b2db2928d70b9d936 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 19 Jan 2015 17:14:26 -0500 Subject: [PATCH] Glance: configure identity_uri parameter 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 --- manifests/image/api.pp | 2 ++ manifests/image/registry.pp | 5 +++++ spec/classes/cloud_image_api_spec.rb | 1 + spec/classes/cloud_image_registry_spec.rb | 2 ++ 4 files changed, 10 insertions(+) diff --git a/manifests/image/api.pp b/manifests/image/api.pp index 1955cf79..6de2a6ff 100644 --- a/manifests/image/api.pp +++ b/manifests/image/api.pp @@ -211,6 +211,8 @@ class cloud::image::api( # } glance_api_config { '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') { diff --git a/manifests/image/registry.pp b/manifests/image/registry.pp index 6a222a5f..8351ae91 100644 --- a/manifests/image/registry.pp +++ b/manifests/image/registry.pp @@ -131,6 +131,11 @@ class cloud::image::registry( 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': command => 'glance-manage db_sync', user => 'glance', diff --git a/spec/classes/cloud_image_api_spec.rb b/spec/classes/cloud_image_api_spec.rb index a28f95f2..9815c084 100644 --- a/spec/classes/cloud_image_api_spec.rb +++ b/spec/classes/cloud_image_api_spec.rb @@ -85,6 +85,7 @@ describe 'cloud::image::api' do # ) # end 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 is_expected.to contain_class('glance::backend::rbd').with( diff --git a/spec/classes/cloud_image_registry_spec.rb b/spec/classes/cloud_image_registry_spec.rb index dc103174..2dd38749 100644 --- a/spec/classes/cloud_image_registry_spec.rb +++ b/spec/classes/cloud_image_registry_spec.rb @@ -57,6 +57,8 @@ describe 'cloud::image::registry' do ) 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 is_expected.to contain_exec('glance_db_sync').with( :command => 'glance-manage db_sync',