Merge "Glance: configure identity_uri parameter"

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') {

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',

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(

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',