Merge "Debian is using Python 3"
This commit is contained in:
commit
432b3a9fb8
|
@ -5,8 +5,13 @@
|
||||||
class oslo::params {
|
class oslo::params {
|
||||||
include ::openstacklib::defaults
|
include ::openstacklib::defaults
|
||||||
|
|
||||||
$pymongo_package_name = 'python-pymongo'
|
if ($::os_package_type == 'debian') {
|
||||||
$pylibmc_package_name = 'python-pylibmc'
|
$pyvers = '3'
|
||||||
|
} else {
|
||||||
|
$pyvers = ''
|
||||||
|
}
|
||||||
|
$pymongo_package_name = "python${pyvers}-pymongo"
|
||||||
|
$pylibmc_package_name = "python${pyvers}-pylibmc"
|
||||||
|
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
|
|
|
@ -142,11 +142,24 @@ describe 'oslo::cache' do
|
||||||
facts.merge!(OSDefaults.get_facts())
|
facts.merge!(OSDefaults.get_facts())
|
||||||
end
|
end
|
||||||
let(:platform_params) do
|
let(:platform_params) do
|
||||||
platform_params = { :pylibmc_package_name => 'python-pylibmc' }
|
case facts[:osfamily]
|
||||||
|
when 'Debian'
|
||||||
|
if facts[:os_package_type] == 'debian'
|
||||||
|
platform_params = { :pylibmc_package_name => 'python3-pylibmc' }
|
||||||
|
else
|
||||||
|
platform_params = { :pylibmc_package_name => 'python-pylibmc' }
|
||||||
|
end
|
||||||
|
when 'RedHat'
|
||||||
|
platform_params = { :pylibmc_package_name => 'python-pylibmc' }
|
||||||
|
end
|
||||||
|
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
platform_params[:python_memcache_package_name] = 'python-memcache'
|
if facts[:os_package_type] == 'debian'
|
||||||
|
platform_params[:python_memcache_package_name] = 'python3-memcache'
|
||||||
|
else
|
||||||
|
platform_params[:python_memcache_package_name] = 'python-memcache'
|
||||||
|
end
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
platform_params[:python_memcache_package_name] = 'python-memcached'
|
platform_params[:python_memcache_package_name] = 'python-memcached'
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue