openstack
/
puppet-keystone
Code Issues Proposed changes

Get rid of the $pyvers variable 

Since everyone has switched to Python3, it's time for the removal of the
$pyvers variable.

Change-Id: I9555be66cda91643e443be664c8f81879b749ebd
This commit is contained in:
Thomas Goirand 2021-05-21 11:43:14 +02:00
parent 1a0fbe36e1
commit 62d556fc63
5 changed files with 11 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/params.pp
View File

@ -3,9 +3,8 @@
# #
class keystone::params { class keystone::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-keystoneclient" $client_package_name = 'python3-keystoneclient'
$keystone_user = 'keystone' $keystone_user = 'keystone'
$keystone_group = 'keystone' $keystone_group = 'keystone'
$group = 'keystone' $group = 'keystone'
@ -15,9 +14,9 @@ class keystone::params {
$package_name = 'keystone' $package_name = 'keystone'
$service_name = 'keystone' $service_name = 'keystone'
$keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone' $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone'
$python_memcache_package_name = "python${pyvers}-memcache" $python_memcache_package_name = 'python3-memcache'
$python_ldappool_package_name = "python${pyvers}-ldappool" $python_ldappool_package_name = 'python3-ldappool'
$python_pysaml2_package_name = "python${pyvers}-pysaml2" $python_pysaml2_package_name = 'python3-pysaml2'
$mellon_package_name = 'libapache2-mod-auth-mellon' $mellon_package_name = 'libapache2-mod-auth-mellon'
$openidc_package_name = 'libapache2-mod-auth-openidc' $openidc_package_name = 'libapache2-mod-auth-openidc'
} }
@ -25,9 +24,9 @@ class keystone::params {
$package_name = 'openstack-keystone' $package_name = 'openstack-keystone'
$service_name = 'openstack-keystone' $service_name = 'openstack-keystone'
$keystone_wsgi_script_path = '/var/www/cgi-bin/keystone' $keystone_wsgi_script_path = '/var/www/cgi-bin/keystone'
$python_memcache_package_name = "python${pyvers}-memcached" $python_memcache_package_name = 'python3-memcached'
$python_ldappool_package_name = "python${pyvers}-ldappool" $python_ldappool_package_name = 'python3-ldappool'
$python_pysaml2_package_name = "python${pyvers}-pysaml2" $python_pysaml2_package_name = 'python3-pysaml2'
$mellon_package_name = 'mod_auth_mellon' $mellon_package_name = 'mod_auth_mellon'
$openidc_package_name = 'mod_auth_openidc' $openidc_package_name = 'mod_auth_openidc'
} }

10
spec/classes/keystone_client_spec.rb
View File

@ -46,15 +46,7 @@ describe 'keystone::client' do
when 'Debian' when 'Debian'
{ :client_package_name => 'python3-keystoneclient' } { :client_package_name => 'python3-keystoneclient' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora' { :client_package_name => 'python3-keystoneclient' }
{ :client_package_name => 'python3-keystoneclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-keystoneclient' }
else
{ :client_package_name => 'python-keystoneclient' }
end
end
end end
end end

10
spec/classes/keystone_federation_identity_provider_spec.rb
View File

@ -122,15 +122,7 @@ describe 'keystone::federation::identity_provider' do
let (:platform_params) do let (:platform_params) do
if facts[:osfamily] == 'RedHat' if facts[:osfamily] == 'RedHat'
keystone_service = 'openstack-keystone' keystone_service = 'openstack-keystone'
if facts[:operatingsystem] == 'Fedora' python_pysaml2_package_name = 'python3-pysaml2'
python_pysaml2_package_name = 'python3-pysaml2'
else
if facts[:operatingsystemmajrelease] > '7'
python_pysaml2_package_name = 'python3-pysaml2'
else
python_pysaml2_package_name = 'python-pysaml2'
end
end
else else
keystone_service = 'keystone' keystone_service = 'keystone'
python_pysaml2_package_name = 'python3-pysaml2' python_pysaml2_package_name = 'python3-pysaml2'

10
spec/classes/keystone_ldap_spec.rb
View File

@ -151,15 +151,7 @@ describe 'keystone::ldap' do
when 'Debian' when 'Debian'
{ :python_ldappool_package_name => 'python3-ldappool' } { :python_ldappool_package_name => 'python3-ldappool' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora' { :python_ldappool_package_name => 'python3-ldappool' }
{ :python_ldappool_package_name => 'python3-ldappool' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :python_ldappool_package_name => 'python3-ldappool' }
else
{ :python_ldappool_package_name => 'python-ldappool' }
end
end
end end
end end
it_behaves_like 'keystone::ldap' it_behaves_like 'keystone::ldap'

10
spec/defines/keystone_ldap_backend_spec.rb
View File

@ -220,15 +220,7 @@ describe 'keystone::ldap_backend' do
when 'Debian' when 'Debian'
{ :python_ldappool_package_name => 'python3-ldappool' } { :python_ldappool_package_name => 'python3-ldappool' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora' { :python_ldappool_package_name => 'python3-ldappool' }
{ :python_ldappool_package_name => 'python3-ldappool' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :python_ldappool_package_name => 'python3-ldappool' }
else
{ :python_ldappool_package_name => 'python-ldappool' }
end
end
end end
end end
it_behaves_like 'keystone::ldap_backend' it_behaves_like 'keystone::ldap_backend'