Expect python3 packages in CentOS8 and Fedora
Change-Id: I456b1b8da7fc234422ff6be454e218847b58b42c
This commit is contained in:
parent
4582343135
commit
2fdcfb5b71
|
@ -141,22 +141,26 @@ describe 'oslo::cache' do
|
||||||
let (:facts) do
|
let (:facts) do
|
||||||
facts.merge!(OSDefaults.get_facts())
|
facts.merge!(OSDefaults.get_facts())
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:platform_params) do
|
let(:platform_params) do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
platform_params = { :pylibmc_package_name => 'python3-pylibmc' }
|
{ :pylibmc_package_name => 'python3-pylibmc',
|
||||||
|
:python_memcache_package_name => 'python3-memcache' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
platform_params = { :pylibmc_package_name => 'python-pylibmc' }
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
{ :pylibmc_package_name => 'python3-pylibmc',
|
||||||
|
:python_memcache_package_name => 'python3-memcached' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :pylibmc_package_name => 'python3-pylibmc',
|
||||||
|
:python_memcache_package_name => 'python3-memcached' }
|
||||||
|
else
|
||||||
|
{ :pylibmc_package_name => 'python-pylibmc',
|
||||||
|
:python_memcache_package_name => 'python-memcached' }
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
case facts[:osfamily]
|
|
||||||
when 'Debian'
|
|
||||||
platform_params[:python_memcache_package_name] = 'python3-memcache'
|
|
||||||
when 'RedHat'
|
|
||||||
platform_params[:python_memcache_package_name] = 'python-memcached'
|
|
||||||
end
|
|
||||||
|
|
||||||
platform_params
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it_behaves_like 'oslo-cache'
|
it_behaves_like 'oslo-cache'
|
||||||
|
|
|
@ -248,11 +248,27 @@ describe 'oslo::db' do
|
||||||
:pysqlite2_package_name => 'python3-pysqlite2',
|
:pysqlite2_package_name => 'python3-pysqlite2',
|
||||||
}
|
}
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
:pymongo_package_name => 'python-pymongo',
|
{
|
||||||
:pymysql_package_name => nil,
|
:pymongo_package_name => 'python3-pymongo',
|
||||||
:pysqlite2_package_name => nil,
|
:pymysql_package_name => nil,
|
||||||
}
|
:pysqlite2_package_name => nil,
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{
|
||||||
|
:pymongo_package_name => 'python3-pymongo',
|
||||||
|
:pymysql_package_name => nil,
|
||||||
|
:pysqlite2_package_name => nil,
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
:pymongo_package_name => 'python-pymongo',
|
||||||
|
:pymysql_package_name => nil,
|
||||||
|
:pysqlite2_package_name => nil,
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue