openstack
/
puppet-keystone
Code Issues Proposed changes

Debian is using python 3 

Switch python-keystoneclient and python-memcache to their py3 counterpart
when running in Debian.

Change-Id: I129749cee6711b7c50097adf250523f507ee0605
This commit is contained in:
Thomas Goirand 2018-04-24 17:12:02 +02:00
parent 6a403c4aff
commit bad6849b76
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/params.pp
View File

@ -3,7 +3,12 @@
#
class keystone::params {
include ::openstacklib::defaults
$client_package_name = 'python-keystoneclient'
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package_name = "python${pyvers}-keystoneclient"
$keystone_user = 'keystone'
$keystone_group = 'keystone'
$keystone_wsgi_admin_script_path = '/usr/bin/keystone-wsgi-admin'
@ -14,13 +19,7 @@ class keystone::params {
$package_name = 'keystone'
$service_name = 'keystone'
$keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone'
if $::os_package_type == 'debian' {
$python_memcache_package_name = 'python3-memcache'
} else {
$python_memcache_package_name = 'python-memcache'
}
$python_memcache_package_name = "python${pyvers}-memcache"
$mellon_package_name = 'libapache2-mod-auth-mellon'
$openidc_package_name = 'libapache2-mod-auth-openidc'
}

15
spec/classes/keystone_init_spec.rb
View File

@ -585,10 +585,17 @@ describe 'keystone' do
it { is_expected.to contain_keystone_config('cache/memcache_pool_maxsize').with_value('1000') }
it { is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_value('60') }
it { is_expected.to contain_keystone_config('cache/memcache_servers').with_value('SERVER1:11211,SERVER2:11211') }
it { is_expected.to contain_package('python-memcache').with(
:name => 'python-memcache',
:ensure => 'present'
) }
it {
if facts[:os_package_type] == 'debian'
pkg = 'python3-memcache'
else
pkg = 'python-memcache'
end
is_expected.to contain_package('python-memcache').with(
:name => pkg,
:ensure => 'present'
)
}
end
describe 'configure cache memcache servers if set' do

5
spec/defines/keystone_resource_authtoken_spec.rb
View File

@ -151,6 +151,11 @@ describe 'keystone::resource::authtoken' do
is_expected.to contain_keystone_config('keystone_authtoken/memcache_pool_maxsize').with_value( params[:memcache_pool_maxsize] )
is_expected.to contain_keystone_config('keystone_authtoken/memcache_pool_dead_retry').with_value( params[:memcache_pool_dead_retry] )
is_expected.to contain_keystone_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value( params[:memcache_pool_conn_get_timeout] )
if facts[:os_package_type] == 'debian'
pkg = 'python3-memcache'
else
pkg = 'python-memcache'
end
is_expected.to contain_package('python-memcache').with(
:name => platform_params[:memcache_package_name],
:ensure => 'present'