Debian/Ubuntu: Do not install python3-pysqlite2
The python3-pysqlite2 package is no longer available, and the built-in sqlite3 library is used instead. Conflicts: manifests/db.pp spec/defines/oslo_db_spec.rb Closes-Bug: #2046335 Change-Id: I9642ca3b6e37d3a85ae274d38a8376e9afa03042 (cherry picked from commit 482fae00cd4992ded18fea169e4a86993d550725) (cherry picked from commit 0787356604486cf84f7fe4a78fecfa5c3f127639)
This commit is contained in:
parent
37c891eec4
commit
3041590482
@ -157,7 +157,7 @@ define oslo::db(
|
||||
require 'postgresql::lib::python'
|
||||
}
|
||||
/^sqlite:\/\//: {
|
||||
$backend_package = $::oslo::params::sqlite_package_name
|
||||
$backend_package = false
|
||||
}
|
||||
default: {
|
||||
fail('Unsupported backend configured')
|
||||
|
@ -9,7 +9,6 @@ class oslo::params {
|
||||
|
||||
case $facts['os']['family'] {
|
||||
'RedHat': {
|
||||
$sqlite_package_name = undef
|
||||
$pymysql_package_name = undef
|
||||
$python_memcache_package_name = 'python3-memcached'
|
||||
$python_redis_package_name = 'python3-redis'
|
||||
@ -18,7 +17,6 @@ class oslo::params {
|
||||
$python_pymemcache_package_name = 'python3-pymemcache'
|
||||
}
|
||||
'Debian': {
|
||||
$sqlite_package_name = 'python3-pysqlite2'
|
||||
$pymysql_package_name = 'python3-pymysql'
|
||||
$python_memcache_package_name = 'python3-memcache'
|
||||
$python_redis_package_name = 'python3-redis'
|
||||
|
@ -157,32 +157,6 @@ describe 'oslo::db' do
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'with sqlite backend' do
|
||||
let :params do
|
||||
{ :connection => 'sqlite:///var/lib/db.db', }
|
||||
end
|
||||
|
||||
it 'install the proper backend package' do
|
||||
is_expected.to contain_package(platform_params[:pysqlite2_package_name]).with(
|
||||
:ensure => 'present',
|
||||
:name => platform_params[:pysqlite2_package_name],
|
||||
:tag => 'openstack'
|
||||
)
|
||||
end
|
||||
|
||||
context 'with backend package management disabled' do
|
||||
before do
|
||||
params.merge!({
|
||||
:manage_backend_package => false,
|
||||
})
|
||||
end
|
||||
|
||||
it 'does not install backend package' do
|
||||
is_expected.not_to contain_package('python-pysqlite2')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'oslo-db on RedHat' do
|
||||
@ -211,13 +185,11 @@ describe 'oslo::db' do
|
||||
{
|
||||
:pymongo_package_name => 'python3-pymongo',
|
||||
:pymysql_package_name => 'python3-pymysql',
|
||||
:pysqlite2_package_name => 'python3-pysqlite2',
|
||||
}
|
||||
when 'RedHat'
|
||||
{
|
||||
:pymongo_package_name => 'python3-pymongo',
|
||||
:pymysql_package_name => nil,
|
||||
:pysqlite2_package_name => nil,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user