Debian/Ubuntu: Do not install python3-pysqlite2
The python3-pysqlite2 package is no longer available, and the built-in sqlite3 library is used instead. Closes-Bug: #2046335 Change-Id: I9642ca3b6e37d3a85ae274d38a8376e9afa03042
This commit is contained in:
parent
a878ebe071
commit
482fae00cd
|
@ -156,7 +156,7 @@ define oslo::db(
|
||||||
require 'postgresql::lib::python'
|
require 'postgresql::lib::python'
|
||||||
}
|
}
|
||||||
Oslo::Dbconn::Sqlite: {
|
Oslo::Dbconn::Sqlite: {
|
||||||
$backend_package = $::oslo::params::sqlite_package_name
|
$backend_package = undef
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
$backend_package = undef
|
$backend_package = undef
|
||||||
|
|
|
@ -9,7 +9,6 @@ class oslo::params {
|
||||||
|
|
||||||
case $facts['os']['family'] {
|
case $facts['os']['family'] {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$sqlite_package_name = undef
|
|
||||||
$pymysql_package_name = undef
|
$pymysql_package_name = undef
|
||||||
$python_memcache_package_name = 'python3-memcached'
|
$python_memcache_package_name = 'python3-memcached'
|
||||||
$python_redis_package_name = 'python3-redis'
|
$python_redis_package_name = 'python3-redis'
|
||||||
|
@ -18,7 +17,6 @@ class oslo::params {
|
||||||
$python_pymemcache_package_name = 'python3-pymemcache'
|
$python_pymemcache_package_name = 'python3-pymemcache'
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$sqlite_package_name = 'python3-pysqlite2'
|
|
||||||
$pymysql_package_name = 'python3-pymysql'
|
$pymysql_package_name = 'python3-pymysql'
|
||||||
$python_memcache_package_name = 'python3-memcache'
|
$python_memcache_package_name = 'python3-memcache'
|
||||||
$python_redis_package_name = 'python3-redis'
|
$python_redis_package_name = 'python3-redis'
|
||||||
|
|
|
@ -168,32 +168,6 @@ describe 'oslo::db' do
|
||||||
end
|
end
|
||||||
end
|
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 => 'installed',
|
|
||||||
: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
|
end
|
||||||
|
|
||||||
shared_examples 'oslo-db on RedHat' do
|
shared_examples 'oslo-db on RedHat' do
|
||||||
|
@ -222,13 +196,11 @@ describe 'oslo::db' do
|
||||||
{
|
{
|
||||||
:pymongo_package_name => 'python3-pymongo',
|
:pymongo_package_name => 'python3-pymongo',
|
||||||
:pymysql_package_name => 'python3-pymysql',
|
:pymysql_package_name => 'python3-pymysql',
|
||||||
:pysqlite2_package_name => 'python3-pysqlite2',
|
|
||||||
}
|
}
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
{
|
||||||
:pymongo_package_name => 'python3-pymongo',
|
:pymongo_package_name => 'python3-pymongo',
|
||||||
:pymysql_package_name => nil,
|
:pymysql_package_name => nil,
|
||||||
:pysqlite2_package_name => nil,
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue