openstack
/
fuel-library
Code Issues Proposed changes

Remove setting of revoke driver in keystone.conf 

contrib.revoke.sql module has been removed, we need
to use default value in keystone.conf

Change-Id: I0040565f66b36c28f0280c9a3f534d53825ad1b3
Closes-bug: #1670206
This commit is contained in:
Vladimir Kuklin 2017-03-06 01:35:28 +03:00
parent e1af023451
commit 8df6ddde30
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
View File

@ -88,7 +88,6 @@ class openstack_tasks::keystone::keystone {
$token_caching = false
$token_driver = 'keystone.token.persistence.backends.memcache_pool.Token'
$token_provider = hiera('token_provider')
$revoke_driver = 'keystone.contrib.revoke.backends.sql.Revoke'
$public_url = "${public_protocol}://${public_address}:${public_port}"
$admin_url = "${admin_protocol}://${admin_address}:${admin_port}"
@ -322,7 +321,6 @@ class openstack_tasks::keystone::keystone {
notification_driver => $ceilometer_hash['notification_driver'],
token_caching => $token_caching,
cache_backend => $cache_backend,
revoke_driver => $revoke_driver,
admin_endpoint => $admin_url,
memcache_dead_retry => '60',
memcache_socket_timeout => '1',

5
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -59,7 +59,6 @@ describe manifest do
let(:admin_url) { "#{admin_auth_protocol}://#{admin_auth_address}:35357" }
revoke_driver = 'keystone.contrib.revoke.backends.sql.Revoke'
database_idle_timeout = '3600'
ceilometer_hash = Noop.hiera_hash 'ceilometer', { 'enabled' => false }
murano_hash = Noop.hiera_hash 'murano', { 'enabled' => false }
@ -201,10 +200,6 @@ describe manifest do
should contain_keystone_config('memcache/socket_timeout').with(:value => '1')
end
it 'should configure revoke_driver for keystone' do
should contain_keystone_config('revoke/driver').with(:value => revoke_driver)
end
it 'should configure database_idle_timeout for keystone' do
should contain_keystone_config('database/idle_timeout').with(:value => database_idle_timeout)
end