openstack
/
puppet-glance
Code Issues Proposed changes

Add support for db_max_retries param 

The db_max_retries parameter regulates the number of reconnection
attempts performed after an error raised rather than at startup.

Change-Id: Ic1192deded14f9640aa02fe00f5339d3a878de70
Closes-Bug: 1579718
Co-Authored-By: Giulio Fidende <gfidente@redhat.com>
This commit is contained in:
Carlos Camacho 2016-05-09 18:01:31 +02:00 committed by Alex Schultz
parent 0cf9a7ae60
commit 283e33c00b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/registry/db.pp
View File

@ -4,6 +4,11 @@
#
# === Parameters
#
# [*database_db_max_retries*]
# (optional) Maximum retries in case of connection error or deadlock error
# before error is raised. Set to -1 to specify an infinite retry count.
# Defaults to $::os_service_default.
#
# [*database_connection*]
# Url used to connect to database.
# (Optional) Defaults to 'sqlite:///var/lib/glance/glance.sqlite'.
@ -34,6 +39,7 @@
# (Optional) Defaults to $::os_service_default.
#
class glance::registry::db (
$database_db_max_retries = $::os_service_default,
$database_connection = 'sqlite:///var/lib/glance/glance.sqlite',
$database_idle_timeout = $::os_service_default,
$database_min_pool_size = $::os_service_default,
@ -57,6 +63,7 @@ class glance::registry::db (
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
oslo::db { 'glance_registry_config':
db_max_retries => $database_db_max_retries,
connection => $database_connection_real,
idle_timeout => $database_idle_timeout_real,
min_pool_size => $database_min_pool_size_real,

5
spec/classes/glance_registry_db_spec.rb
View File

@ -4,6 +4,7 @@ describe 'glance::registry::db' do
shared_examples 'glance::registry::db' do
context 'with default parameters' do
it { is_expected.to contain_glance_registry_config('database/db_max_retries').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('database/connection').with_value('sqlite:///var/lib/glance/glance.sqlite').with_secret(true) }
it { is_expected.to contain_glance_registry_config('database/idle_timeout').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_glance_registry_config('database/min_pool_size').with_value('<SERVICE DEFAULT>') }
@ -15,7 +16,8 @@ describe 'glance::registry::db' do
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance',
{ :database_db_max_retries => '-1',
:database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
@ -25,6 +27,7 @@ describe 'glance::registry::db' do
}
end
it { is_expected.to contain_glance_registry_config('database/db_max_retries').with_value('-1') }
it { is_expected.to contain_glance_registry_config('database/connection').with_value('mysql+pymysql://glance_registry:glance@localhost/glance').with_secret(true) }
it { is_expected.to contain_glance_registry_config('database/idle_timeout').with_value('3601') }
it { is_expected.to contain_glance_registry_config('database/min_pool_size').with_value('2') }