openstack/puppet-oslo
Code Issues Proposed changes

Merge "Debian is using Python 3"

Browse Source
This commit is contained in:
Zuul 2018-04-10 16:18:01 +00:00 committed by Gerrit Code Review
commit 432b3a9fb8
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/params.pp
View File

@ -5,8 +5,13 @@
class oslo::params {
include ::openstacklib::defaults
$pymongo_package_name = 'python-pymongo'
$pylibmc_package_name = 'python-pylibmc'
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$pymongo_package_name = "python${pyvers}-pymongo"
$pylibmc_package_name = "python${pyvers}-pylibmc"
case $::osfamily {
'RedHat': {

17
spec/defines/oslo_cache_spec.rb
View File

@ -142,11 +142,24 @@ describe 'oslo::cache' do
facts.merge!(OSDefaults.get_facts())
end
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]
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'
platform_params[:python_memcache_package_name] = 'python-memcached'
end