openstack/puppet-aodh
Code Issues Proposed changes

Get rid of the $pyvers variable

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

Change-Id: Id4d8b8cb808b3724ccc146691cde2d4605afe72a
This commit is contained in:
Thomas Goirand 2021-05-21 10:41:16 +02:00
parent 69ebbeafd9
commit 5f1e9e7c5c
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -2,9 +2,8 @@
#
class aodh::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-aodhclient"
$client_package_name = 'python3-aodhclient'
$group = 'aodh'
$expirer_command = 'aodh-expirer'
@ -23,7 +22,7 @@ class aodh::params {
$listener_service_name = 'openstack-aodh-listener'
$aodh_wsgi_script_dir = '/var/www/cgi-bin/aodh'
$aodh_wsgi_script_source = '/usr/bin/aodh-api'
$redis_package_name = "python${pyvers}-redis"
$redis_package_name = 'python3-redis'
}
'Debian': {
$common_package_name = 'aodh-common'
@ -46,7 +45,7 @@ class aodh::params {
$listener_service_name = 'aodh-listener'
$aodh_wsgi_script_dir = '/usr/lib/cgi-bin/aodh'
$aodh_wsgi_script_source = '/usr/share/aodh/app.wsgi'
$redis_package_name = "python${pyvers}-redis"
$redis_package_name = 'python3-redis'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \

12
spec/classes/aodh_client_spec.rb
View File

@ -10,7 +10,7 @@ describe 'aodh::client' do
it 'installs aodh client package' do
is_expected.to contain_package('python-aodhclient').with(
:ensure => 'present',
:name => platform_params[:client_package_name],
:name => 'python3-aodhclient',
:tag => 'openstack',
)
end
@ -31,15 +31,7 @@ describe 'aodh::client' do
when 'Debian'
{ :client_package_name => 'python3-aodhclient' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package_name => 'python3-aodhclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-aodhclient' }
else
{ :client_package_name => 'python-aodhclient' }
end
end
{ :client_package_name => 'python3-aodhclient' }
end
end