stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Add support for SQL idle timeout."

Browse Source
This commit is contained in:
Jenkins
2013-07-04 01:04:31 +00:00
committed by Gerrit Code Review
parent 2982f3217a 2ad77a532c
commit fd76e6abc8
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/keystone.pp
View File

@@ -6,6 +6,7 @@
# === Parameters # === Parameters
# #
# [db_host] Host where DB resides. Optional. Defaults to 127.0.0.1.. # [db_host] Host where DB resides. Optional. Defaults to 127.0.0.1..
# [idle_timeout] Timeout to reap SQL connections. Optional. Defaults to '200'.
# [keystone_db_password] Password for keystone DB. Required. # [keystone_db_password] Password for keystone DB. Required.
# [keystone_admin_token]. Auth token for keystone admin. Required. # [keystone_admin_token]. Auth token for keystone admin. Required.
# [admin_email] Email address of system admin. Required. # [admin_email] Email address of system admin. Required.
@@ -52,6 +53,7 @@ class openstack::keystone (
$quantum_user_password, $quantum_user_password,
$public_address, $public_address,
$db_host = '127.0.0.1', $db_host = '127.0.0.1',
$idle_timeout = '200',
$swift_user_password = false, $swift_user_password = false,
$db_type = 'mysql', $db_type = 'mysql',
$db_user = 'keystone', $db_user = 'keystone',
@@ -184,6 +186,7 @@ class openstack::keystone (
verbose => $verbose, verbose => $verbose,
debug => $verbose, debug => $verbose,
bind_host => $bind_host, bind_host => $bind_host,
idle_timeout => $idle_timeout,
catalog_type => 'sql', catalog_type => 'sql',
admin_token => $admin_token, admin_token => $admin_token,
enabled => $enabled, enabled => $enabled,

1
spec/classes/openstack_keystone_spec.rb
View File

@@ -34,6 +34,7 @@ describe 'openstack::keystone' do
:verbose => 'False', :verbose => 'False',
:debug => 'False', :debug => 'False',
:bind_host => '0.0.0.0', :bind_host => '0.0.0.0',
:idle_timeout => '200',
:catalog_type => 'sql', :catalog_type => 'sql',
:admin_token => 'token', :admin_token => 'token',
:enabled => true, :enabled => true,