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:19:57 +00:00
committed by Gerrit Code Review
parent 88ef35c940 8cf6e1fc85
commit 6b9408b8b9
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/glance.pp
View File

@@ -14,6 +14,7 @@
# [db_password] Password for glance DB. Required. # [db_password] Password for glance DB. Required.
# [db_host] Host where DB resides. Required. # [db_host] Host where DB resides. Required.
# [keystone_host] Host whre keystone is running. Optional. Defaults to '127.0.0.1' # [keystone_host] Host whre keystone is running. Optional. Defaults to '127.0.0.1'
# [sql_idle_timeout] Timeout for SQL to reap connections. Optional. Defaults to '3600'
# [db_type] Type of sql databse to use. Optional. Defaults to 'mysql' # [db_type] Type of sql databse to use. Optional. Defaults to 'mysql'
# [db_user] Name of glance DB user. Optional. Defaults to 'glance' # [db_user] Name of glance DB user. Optional. Defaults to 'glance'
# [db_name] Name of glance DB. Optional. Defaults to 'glance' # [db_name] Name of glance DB. Optional. Defaults to 'glance'
@@ -38,6 +39,7 @@ class openstack::glance (
$db_password, $db_password,
$db_host = '127.0.0.1', $db_host = '127.0.0.1',
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
$sql_idle_timeout = '3600',
$db_type = 'mysql', $db_type = 'mysql',
$db_user = 'glance', $db_user = 'glance',
$db_name = 'glance', $db_name = 'glance',
@@ -67,6 +69,7 @@ class openstack::glance (
keystone_user => 'glance', keystone_user => 'glance',
keystone_password => $user_password, keystone_password => $user_password,
sql_connection => $sql_connection, sql_connection => $sql_connection,
sql_idle_timeout => $sql_idle_timeout,
enabled => $enabled, enabled => $enabled,
} }

1
spec/classes/openstack_glance_spec.rb
View File

@@ -29,6 +29,7 @@ describe 'openstack::glance' do
:keystone_user => 'glance', :keystone_user => 'glance',
:keystone_password => 'glance_user_pass', :keystone_password => 'glance_user_pass',
:sql_connection => 'mysql://glance:glance_db_pass@127.0.0.1/glance', :sql_connection => 'mysql://glance:glance_db_pass@127.0.0.1/glance',
:sql_idle_timeout => '3600',
:enabled => true :enabled => true
) )
should contain_class('glance::registry').with( should contain_class('glance::registry').with(