openstack
/
puppet-vitrage
Code Issues Proposed changes

Merge "Fix mysql connection"

This commit is contained in:
Zuul 2018-03-09 17:31:57 +00:00 committed by Gerrit Code Review
parent 5efbffcbb1 c9b4316df4
commit 1085c0ec95
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db.pp
View File

@ -6,7 +6,7 @@
#
# [*database_connection*]
# (Optional) Url used to connect to database.
# Defaults to "mysql://vitrage:secrete@localhost:3306/vitrage".
# Defaults to "mysql+pymysql://vitrage:secrete@localhost:3306/vitrage".
#
# [*database_max_retries*]
# (Optional) Maximum number of database connection retries during startup.
@ -39,7 +39,7 @@
# Defaults to $::os_service_default.
#
class vitrage::db (
$database_connection = 'mysql://vitrage:secrete@localhost:3306/vitrage',
$database_connection = 'mysql+pymysql://vitrage:secrete@localhost:3306/vitrage',
$database_idle_timeout = $::os_service_default,
$database_min_pool_size = $::os_service_default,
$database_max_pool_size = $::os_service_default,

4
spec/classes/vitrage_db_spec.rb
View File

@ -6,7 +6,7 @@ describe 'vitrage::db' do
context 'with default parameters' do
it { is_expected.to contain_oslo__db('vitrage_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'mysql://vitrage:secrete@localhost:3306/vitrage',
:connection => 'mysql+pymysql://vitrage:secrete@localhost:3306/vitrage',
:idle_timeout => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>',
@ -54,7 +54,7 @@ describe 'vitrage::db' do
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql://vitrage:vitrage@localhost/vitrage', }
{ :database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage', }
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }