x/puppet-tuskar
Code Issues Proposed changes

Support of PyMySQL driver for MySQL backend

Browse Source 
Add ability to use python-pymysql library
as backend for MySQL connections.
Update acceptance tests to use pyMySQL.
Docs: https://wiki.openstack.org/wiki/PyMySQL_evaluation
The same implementation as it's done for keystone:
https://review.openstack.org/#/c/242134/

Change-Id: I669bec38286a863dab3e112e9442f2484bbe107c
This commit is contained in:
iberezovskiy 2015-11-24 13:16:12 +03:00
parent 12849acc66
commit 1d38418876
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/db.pp
View File

@ -56,14 +56,18 @@ class tuskar::db (
$database_max_overflow_real = pick($::tuskar::database_max_overflow, $database_max_overflow)
validate_re($database_connection_real,
'(sqlite|mysql|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
if $database_connection_real {
case $database_connection_real {
/^mysql:\/\//: {
$backend_package = false
/^mysql(\+pymysql)?:\/\//: {
require 'mysql::bindings'
require 'mysql::bindings::python'
if $database_connection_real =~ /^mysql\+pymysql/ {
$backend_package = $::tuskar::params::pymysql_package_name
} else {
$backend_package = false
}
}
/^postgresql:\/\//: {
$backend_package = false

2
manifests/params.pp
View File

@ -10,6 +10,7 @@ class tuskar::params {
$ui_package_name = 'openstack-tuskar-ui'
$ui_extras_package_name = 'openstack-tuskar-ui-extras'
$sqlite_package_name = undef
$pymysql_package_name = 'python2-PyMySQL'
}
'Debian': {
$client_package_name = 'python-tuskarclient'
@ -18,6 +19,7 @@ class tuskar::params {
$ui_package_name = 'tuskar-ui'
$ui_extras_package_name = 'tuskar-ui-extras'
$sqlite_package_name = 'python-pysqlite2'
$pymysql_package_name = 'python-pymysql'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")

29
spec/classes/tuskar_db_spec.rb
View File

@ -16,21 +16,30 @@ describe 'tuskar::db' do
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql://tuskar:tuskar@localhost/tuskar',
{ :database_connection => 'mysql+pymysql://tuskar:tuskar@localhost/tuskar',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
:database_retry_interval => '11', }
end
it { is_expected.to contain_tuskar_config('database/connection').with_value('mysql://tuskar:tuskar@localhost/tuskar').with_secret(true) }
it { is_expected.to contain_tuskar_config('database/connection').with_value('mysql+pymysql://tuskar:tuskar@localhost/tuskar').with_secret(true) }
it { is_expected.to contain_tuskar_config('database/idle_timeout').with_value('3601') }
it { is_expected.to contain_tuskar_config('database/min_pool_size').with_value('2') }
it { is_expected.to contain_tuskar_config('database/max_retries').with_value('11') }
it { is_expected.to contain_tuskar_config('database/retry_interval').with_value('11') }
it { is_expected.to contain_package('tuskar-backend-package').with({ :ensure => 'present', :name => platform_params[:pymysql_package_name] }) }
end
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql://tuskar:tuskar@localhost/tuskar', }
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
end
context 'with postgresql backend' do
let :params do
{ :database_connection => 'postgresql://tuskar:tuskar@localhost/tuskar', }
@ -50,6 +59,14 @@ describe 'tuskar::db' do
it_raises 'a Puppet::Error', /validate_re/
end
context 'with incorrect pymysql database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://tuskar:tuskar@localhost/tuskar', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
context 'on Debian platforms' do
@ -60,6 +77,10 @@ describe 'tuskar::db' do
})
end
let :platform_params do
{ :pymysql_package_name => 'python-pymysql' }
end
it_configures 'tuskar::db'
context 'with sqlite backend' do
@ -85,6 +106,10 @@ describe 'tuskar::db' do
})
end
let :platform_params do
{ :pymysql_package_name => 'python2-PyMySQL' }
end
it_configures 'tuskar::db'
end