openstack
/
puppet-ceilometer
Code Issues Proposed changes

Merge "Fix mysql connection"

This commit is contained in:
Zuul 2018-03-13 06:35:49 +00:00 committed by Gerrit Code Review
parent b6a61b9f39 76bce0ada4
commit 9964140c43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db.pp
View File

@ -13,7 +13,7 @@
#
# [*database_connection*]
# (Optional) Url used to connect to database.
# Defaults to 'mysql://ceilometer:ceilometer@localhost/ceilometer'.
# Defaults to 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer'.
#
# [*database_idle_timeout*]
# (Optional) Timeout when db connections should be reaped.
@ -46,7 +46,7 @@
#
class ceilometer::db (
$database_db_max_retries = $::os_service_default,
$database_connection = 'mysql://ceilometer:ceilometer@localhost/ceilometer',
$database_connection = 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer',
$database_idle_timeout = $::os_service_default,
$database_min_pool_size = $::os_service_default,
$database_max_pool_size = $::os_service_default,

2
spec/classes/ceilometer_db_spec.rb
View File

@ -10,7 +10,7 @@ describe 'ceilometer::db' do
it { is_expected.to contain_class('ceilometer::db::sync') }
it { is_expected.to contain_oslo__db('ceilometer_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'mysql://ceilometer:ceilometer@localhost/ceilometer',
:connection => 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer',
:idle_timeout => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>',