openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Support of PyMySQL driver for MySQL backend"

This commit is contained in:
Jenkins 2015-12-07 23:46:20 +00:00 committed by Gerrit Code Review
parent 72749e7a1d b6a9a2fd93
commit 0902c3dccd
6 changed files with 102 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api/db.pp
View File

@ -43,6 +43,8 @@ class glance::api::db (
$database_max_overflow = $::os_service_default,
) {
include ::glance::params
# NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
# to use glance::api::<myparam> if glance::api::db::<myparam> isn't specified.
$database_connection_real = pick($::glance::api::database_connection, $database_connection)
@ -54,13 +56,17 @@ class glance::api::db (
$database_max_overflow_real = pick($::glance::api::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+)?')
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 = $::glance::params::pymysql_package_name
} else {
$backend_package = false
}
}
/^postgresql:\/\//: {
$backend_package = false

2
manifests/params.pp
View File

@ -19,6 +19,7 @@ class glance::params {
$pyceph_package_name = 'python-rbd'
}
$sqlite_package_name = undef
$pymysql_package_name = undef
}
'Debian': {
$api_package_name = 'glance-api'
@ -27,6 +28,7 @@ class glance::params {
$registry_service_name = 'glance-registry'
$pyceph_package_name = 'python-ceph'
$sqlite_package_name = 'python-pysqlite2'
$pymysql_package_name = 'python-pymysql'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")

12
manifests/registry/db.pp
View File

@ -43,6 +43,8 @@ class glance::registry::db (
$database_max_overflow = $::os_service_default,
) {
include ::glance::params
# NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
# to use glance::registry::<myparam> if glance::registry::db::<myparam> isn't specified.
$database_connection_real = pick($::glance::registry::database_connection, $database_connection)
@ -54,13 +56,17 @@ class glance::registry::db (
$database_max_overflow_real = pick($::glance::registry::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+)?')
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 = $::glance::params::pymysql_package_name
} else {
$backend_package = false
}
}
/^postgresql:\/\//: {
$backend_package = false

4
spec/acceptance/basic_glance_spec.rb
View File

@ -22,12 +22,12 @@ describe 'glance class' do
password => 'a_big_secret',
}
class { '::glance::api':
database_connection => 'mysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8',
database_connection => 'mysql+pymysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8',
verbose => false,
keystone_password => 'a_big_secret',
}
class { '::glance::registry':
database_connection => 'mysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8',
database_connection => 'mysql+pymysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8',
verbose => false,
keystone_password => 'a_big_secret',
}

42
spec/classes/glance_api_db_spec.rb
View File

@ -15,7 +15,7 @@ describe 'glance::api::db' do
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql://glance_api:glance@localhost/glance',
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
@ -25,7 +25,7 @@ describe 'glance::api::db' do
}
end
it { is_expected.to contain_glance_api_config('database/connection').with_value('mysql://glance_api:glance@localhost/glance').with_secret(true) }
it { is_expected.to contain_glance_api_config('database/connection').with_value('mysql+pymysql://glance_api:glance@localhost/glance').with_secret(true) }
it { is_expected.to contain_glance_api_config('database/idle_timeout').with_value('3601') }
it { is_expected.to contain_glance_api_config('database/min_pool_size').with_value('2') }
it { is_expected.to contain_glance_api_config('database/max_retries').with_value('11') }
@ -34,6 +34,22 @@ describe 'glance::api::db' do
it { is_expected.to contain_glance_api_config('database/max_overflow').with_value('21') }
end
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql://glance_api:glance@localhost/glance' }
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
end
context 'with incorrect pymysql database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://glance_api:glance@localhost/glance', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
context 'on Debian platforms' do
@ -42,6 +58,20 @@ describe 'glance::api::db' do
end
it_configures 'glance::api::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', }
end
it 'install the proper backend package' do
is_expected.to contain_package('glance-backend-package').with(
:ensure => 'present',
:name => 'python-pymysql',
:tag => 'openstack'
)
end
end
end
context 'on Redhat platforms' do
@ -50,6 +80,14 @@ describe 'glance::api::db' do
end
it_configures 'glance::api::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', }
end
it { is_expected.not_to contain_package('glance-backend-package') }
end
end
end

42
spec/classes/glance_registry_db_spec.rb
View File

@ -15,7 +15,7 @@ describe 'glance::registry::db' do
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql://glance_registry:glance@localhost/glance',
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
@ -25,7 +25,7 @@ describe 'glance::registry::db' do
}
end
it { is_expected.to contain_glance_registry_config('database/connection').with_value('mysql://glance_registry:glance@localhost/glance').with_secret(true) }
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') }
it { is_expected.to contain_glance_registry_config('database/max_retries').with_value('11') }
@ -34,6 +34,22 @@ describe 'glance::registry::db' do
it { is_expected.to contain_glance_registry_config('database/max_overflow').with_value('21') }
end
context 'with MySQL-python library as backend package' do
let :params do
{ :database_connection => 'mysql://glance_registry:glance@localhost/glance' }
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
end
context 'with incorrect pymysql database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://glance_registry:glance@localhost/glance', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
context 'on Debian platforms' do
@ -42,6 +58,20 @@ describe 'glance::registry::db' do
end
it_configures 'glance::registry::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', }
end
it 'install the proper backend package' do
is_expected.to contain_package('glance-backend-package').with(
:ensure => 'present',
:name => 'python-pymysql',
:tag => 'openstack'
)
end
end
end
context 'on Redhat platforms' do
@ -50,6 +80,14 @@ describe 'glance::registry::db' do
end
it_configures 'glance::registry::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', }
end
it { is_expected.not_to contain_package('glance-backend-package') }
end
end
end