openstack/puppet-keystone
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Depends-On: I84b767921d151a61429b2c89e6372c4b447f0d7d
Depends-On: https://review.openstack.org/#/c/631523/
Depends-On: https://review.openstack.org/#/c/633162/
Change-Id: I16d17c4d943bd3d2fe7e49fd1e14376edd912ec1
This commit is contained in:
Lee Yarwood 2019-01-11 14:05:25 +00:00 committed by Tobias Urdin
parent 9f8d2341e4
commit 94f56fbc6b
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -3,12 +3,7 @@
#
class keystone::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-keystoneclient"
$keystone_user = 'keystone'

12
spec/defines/keystone_resource_authtoken_spec.rb
View File

@ -151,11 +151,7 @@ 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'
@ -193,11 +189,7 @@ describe 'keystone::resource::authtoken' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian' then
memcache_package_name = 'python3-memcache'
else
memcache_package_name = 'python-memcache'
end
memcache_package_name = 'python3-memcache'
when 'RedHat'
memcache_package_name = 'python-memcached'
end