Merge "Get rid of the $pyvers variable"
This commit is contained in:
commit
606b016ee3
|
@ -4,29 +4,28 @@
|
|||
#
|
||||
class oslo::params {
|
||||
include openstacklib::defaults
|
||||
$pyvers = $::openstacklib::defaults::pyvers
|
||||
|
||||
$pymongo_package_name = "python${pyvers}-pymongo"
|
||||
$pylibmc_package_name = "python${pyvers}-pylibmc"
|
||||
$pymongo_package_name = 'python3-pymongo'
|
||||
$pylibmc_package_name = 'python3-pylibmc'
|
||||
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
$sqlite_package_name = undef
|
||||
$pymysql_package_name = undef
|
||||
$python_memcache_package_name = "python${pyvers}-memcached"
|
||||
$python_redis_package_name = "python${pyvers}-redis"
|
||||
$python_etcd3gw_package_name = "python${pyvers}-etcd3gw"
|
||||
$python_memcache_package_name = 'python3-memcached'
|
||||
$python_redis_package_name = 'python3-redis'
|
||||
$python_etcd3gw_package_name = 'python3-etcd3gw'
|
||||
$python_etcd3_package_name = undef
|
||||
$python_pymemcache_package_name = "python${pyvers}-pymemcache"
|
||||
$python_pymemcache_package_name = 'python3-pymemcache'
|
||||
}
|
||||
'Debian': {
|
||||
$sqlite_package_name = "python${pyvers}-pysqlite2"
|
||||
$pymysql_package_name = "python${pyvers}-pymysql"
|
||||
$python_memcache_package_name = "python${pyvers}-memcache"
|
||||
$python_redis_package_name = "python${pyvers}-redis"
|
||||
$python_etcd3gw_package_name = "python${pyvers}-etcd3gw"
|
||||
$python_etcd3_package_name = "python${pyvers}-etcd3"
|
||||
$python_pymemcache_package_name = "python${pyvers}-pymemcache"
|
||||
$sqlite_package_name = 'python3-pysqlite2'
|
||||
$pymysql_package_name = 'python3-pymysql'
|
||||
$python_memcache_package_name = 'python3-memcache'
|
||||
$python_redis_package_name = 'python3-redis'
|
||||
$python_etcd3gw_package_name = 'python3-etcd3gw'
|
||||
$python_etcd3_package_name = 'python3-etcd3'
|
||||
$python_pymemcache_package_name = 'python3-pymemcache'
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
|
||||
|
|
|
@ -163,18 +163,8 @@ describe 'oslo::cache' do
|
|||
{ :pylibmc_package_name => 'python3-pylibmc',
|
||||
:python_memcache_package_name => 'python3-memcache' }
|
||||
when 'RedHat'
|
||||
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
|
||||
|
||||
|
|
|
@ -103,21 +103,9 @@ describe 'oslo::coordination' do
|
|||
:python_etcd3gw_package_name => 'python3-etcd3gw',
|
||||
:python_pymemcache_package_name => 'python3-pymemcache' }
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{ :python_redis_package_name => 'python3-redis',
|
||||
:python_etcd3gw_package_name => 'python3-etcd3gw',
|
||||
:python_pymemcache_package_name => 'python3-pymemcache' }
|
||||
else
|
||||
if facts[:operatingsystemmajrelease] > '7'
|
||||
{ :python_redis_package_name => 'python3-redis',
|
||||
:python_etcd3gw_package_name => 'python3-etcd3gw',
|
||||
:python_pymemcache_package_name => 'python3-pymemcache' }
|
||||
else
|
||||
{ :python_redis_package_name => 'python-redis',
|
||||
:python_etcd3gw_package_name => 'python-etcd3gw',
|
||||
:python_pymemcache_package_name => 'python-pymemcache' }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -248,27 +248,11 @@ describe 'oslo::db' do
|
|||
:pysqlite2_package_name => 'python3-pysqlite2',
|
||||
}
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{
|
||||
:pymongo_package_name => 'python3-pymongo',
|
||||
: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
|
||||
|
||||
|
|
Loading…
Reference in New Issue