diff --git a/manifests/db.pp b/manifests/db.pp index 9a535bb..a8e233a 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -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') 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 10d4b12..a16437c 100644 --- a/spec/defines/oslo_db_spec.rb +++ b/spec/defines/oslo_db_spec.rb @@ -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