openstack/puppet-trove
Code Issues Proposed changes

Follow-up on PyMySQL support for Red Hat platforms

Browse Source 
Rely on packaging dependencies to avoid issues caused by different
package names between Fedora and RHEL (python-PyMySQL vs python2-PyMySQL).

https://review.openstack.org/#/c/245229/4/spec/classes/neutron_db_spec.rb
includes all the discussion that led to this.

Change-Id: I32406ad0937241d2a4a02e0e9778fc4929963d3e
This commit is contained in:
iberezovskiy 2015-12-02 17:07:59 +03:00
parent fabf1af142
commit c533f497f1
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -15,7 +15,7 @@ class trove::params {
$taskmanager_package_name = 'openstack-trove-taskmanager'
$taskmanager_service_name = 'openstack-trove-taskmanager'
$sqlite_package_name = undef
$pymysql_package_name = 'python2-PyMySQL'
$pymysql_package_name = undef
}
'Debian': {
$client_package_name = 'python-troveclient'

34
spec/classes/trove_db_spec.rb
View File

@ -34,14 +34,12 @@ describe 'trove::db' do
it { is_expected.to contain_trove_config('database/max_pool_size').with_value('21') }
it { is_expected.to contain_trove_config('database/max_overflow').with_value('21') }
it { is_expected.to contain_trove_config('database/retry_interval').with_value('11') }
it { is_expected.to contain_package('trove-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://trove:trove@localhost/trove', }
end
end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
end
@ -83,11 +81,21 @@ describe 'trove::db' do
}
end
let :platform_params do
{ :pymysql_package_name => 'python-pymysql' }
end
it_configures 'trove::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://trove:trove@localhost/trove', }
end
it 'install the proper backend package' do
is_expected.to contain_package('trove-backend-package').with(
:ensure => 'present',
:name => 'python-pymysql',
:tag => 'openstack'
)
end
end
end
context 'on Redhat platforms' do
@ -97,11 +105,15 @@ describe 'trove::db' do
}
end
let :platform_params do
{ :pymysql_package_name => 'python2-PyMySQL' }
end
it_configures 'trove::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://trove:trove@localhost/trove', }
end
it { is_expected.not_to contain_package('trove-backend-package') }
end
end
end