From 30016792a7d8bb69f3cd9136b201b4bae7dc98bc Mon Sep 17 00:00:00 2001 From: vsaienko Date: Mon, 10 Aug 2015 14:58:09 +0300 Subject: [PATCH] set public_endpoint keystone.conf value set public_endpoint to public_url, since we using SSL, keystone should advertise correct public endpoint. Otherwise keystone advertise HTTP://xxxxxxx:5000 not HTTPS Change-Id: Ided0fdaa7d9162777c2a59b887214c7ee3b87e3c Closes-Bug: #1482707 --- deployment/puppet/openstack/manifests/keystone.pp | 1 + tests/noop/spec/hosts/keystone/keystone_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment/puppet/openstack/manifests/keystone.pp b/deployment/puppet/openstack/manifests/keystone.pp index 13f4ddc2a0..dc04541000 100644 --- a/deployment/puppet/openstack/manifests/keystone.pp +++ b/deployment/puppet/openstack/manifests/keystone.pp @@ -146,6 +146,7 @@ class openstack::keystone ( token_caching => $token_caching, cache_backend => $cache_backend, revoke_driver => $revoke_driver, + public_endpoint => $public_url, } if $memcache_servers { diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb index 7bdee61539..2b093c465a 100644 --- a/tests/noop/spec/hosts/keystone/keystone_spec.rb +++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb @@ -61,7 +61,7 @@ describe manifest do end - it 'should configure memcache_pool keystone cache backend' do + it 'should configure keystone with paramters' do should contain_keystone_config('token/caching').with(:value => 'false') should contain_keystone_config('cache/enabled').with(:value => 'true') should contain_keystone_config('cache/backend').with(:value => 'keystone.cache.memcache_pool') @@ -72,6 +72,7 @@ describe manifest do should contain_keystone_config('cache/memcache_pool_unused_timeout').with(:value => '60') should contain_keystone_config('memcache/dead_retry').with(:value => '300') should contain_keystone_config('memcache/socket_timeout').with(:value => '1') + should contain_keystone_config('DEFAULT/public_endpoint').with(:value => public_url) end it 'should configure revoke_driver for keystone' do