x
/
puppet-tuskar
Code Issues Proposed changes

Follow-up on PyMySQL support for Red Hat platforms 

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: Ic8ec00e47b01bc2963018af7accc4a8a1eff8060
This commit is contained in:
iberezovskiy 2015-12-02 16:51:21 +03:00
parent d8f305967d
commit c659683d0d
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -10,7 +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'
$pymysql_package_name = undef
}
'Debian': {
$client_package_name = 'python-tuskarclient'

32
spec/classes/tuskar_db_spec.rb
View File

@ -28,8 +28,6 @@ describe 'tuskar::db' do
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
@ -77,12 +75,22 @@ describe 'tuskar::db' do
})
end
let :platform_params do
{ :pymysql_package_name => 'python-pymysql' }
end
it_configures 'tuskar::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://tuskar:tuskar@localhost/tuskar', }
end
it 'install the proper backend package' do
is_expected.to contain_package('tuskar-backend-package').with(
:ensure => 'present',
:name => 'python-pymysql',
:tag => 'openstack'
)
end
end
context 'with sqlite backend' do
let :params do
{ :database_connection => 'sqlite:///var/lib/tuskar/tuskar.sqlite', }
@ -106,11 +114,15 @@ describe 'tuskar::db' do
})
end
let :platform_params do
{ :pymysql_package_name => 'python2-PyMySQL' }
end
it_configures 'tuskar::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://tuskar:tuskar@localhost/tuskar', }
end
it { is_expected.not_to contain_package('tuskar-backend-package') }
end
end
end