openstack
/
puppet-nova
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: I6ba84a2636411a0be76603d47ca09ee4c93fbfe6
This commit is contained in:
Javier Pena 2015-12-02 14:23:25 +01:00
parent 2a4e110a7e
commit bd64e9274b
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -27,7 +27,7 @@ class nova::params {
$serialproxy_package_name = 'openstack-nova-serialproxy'
$spicehtml5proxy_package_name = 'openstack-nova-console'
$sqlite_package_name = undef
$pymysql_package_name = 'python2-PyMySQL'
$pymysql_package_name = undef
# service names
$api_service_name = 'openstack-nova-api'
$cells_service_name = 'openstack-nova-cells'

29
spec/classes/nova_db_spec.rb
View File

@ -79,12 +79,21 @@ describe 'nova::db' do
})
end
let :platform_params do
{ :pymysql_package_name => 'python-pymysql' }
end
it_configures 'nova::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://user:pass@db/db', }
end
it 'install the proper backend package' do
is_expected.to contain_package('nova-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/nova/nova.sqlite', }
@ -109,11 +118,15 @@ describe 'nova::db' do
})
end
let :platform_params do
{ :pymysql_package_name => 'python2-PyMySQL' }
end
it_configures 'nova::db'
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://user:pass@db/db', }
end
it { is_expected.not_to contain_package('nova-backend-package') }
end
end
end