diff --git a/manifests/db.pp b/manifests/db.pp index 33e405b..17124c8 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -156,7 +156,7 @@ define oslo::db( require 'postgresql::lib::python' } Oslo::Dbconn::Sqlite: { - $backend_package = $::oslo::params::sqlite_package_name + $backend_package = undef } default: { $backend_package = undef diff --git a/manifests/params.pp b/manifests/params.pp index ccd39d0..94ded56 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/defines/oslo_db_spec.rb b/spec/defines/oslo_db_spec.rb index 4aaa3ff..875eb4d 100644 --- a/spec/defines/oslo_db_spec.rb +++ b/spec/defines/oslo_db_spec.rb @@ -168,32 +168,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 => '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 shared_examples 'oslo-db on RedHat' do @@ -222,13 +196,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