stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Allow user to specify keystone bakcend

Browse Source 
Customer backport

Related to #332
This commit is contained in:
Yanis Guenane
2014-03-04 15:29:21 -05:00
parent 3732b9edcf
commit ec1e56a29c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/identity.pp
View File

@@ -397,7 +397,8 @@ class cloud::identity (
$debug = $os_params::debug,
$log_facility = $os_params::log_facility,
$use_syslog = $os_params::use_syslog,
$ks_token_expiration = $os_params::ks_token_expiration
$ks_token_expiration = $os_params::ks_token_expiration,
$ks_token_driver = 'keystone.token.backends.memcache.Token'
){
# Disable twice logging if syslog is enabled
@@ -420,7 +421,7 @@ class cloud::identity (
log_facility => $log_facility,
memcache_servers => $memcache_servers,
sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone",
token_driver => 'keystone.token.backends.memcache.Token',
token_driver => $ks_token_driver,
token_provider => 'keystone.token.providers.uuid.Provider',
use_syslog => $use_syslog,
verbose => $verbose,

3
spec/classes/cloud_identity_spec.rb
View File

@@ -90,7 +90,8 @@ describe 'cloud::identity' do
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:ks_token_expiration => '3600',
:api_eth => '10.0.0.1' }
:api_eth => '10.0.0.1',
:ks_token_driver => 'keystone.token.backends.memcache.Token' }
end
it 'configure keystone server' do