openstack/puppet-heat
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: Ie5052433ff584d75fcf58c0058f16a05dc97eeaa
This commit is contained in:
Thomas Goirand 2021-05-21 11:22:52 +02:00
parent bfe89fe387
commit 131476ca2b
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -4,9 +4,8 @@
#
class heat::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-heatclient"
$client_package_name = 'python3-heatclient'
$group = 'heat'
case $::osfamily {

10
spec/classes/heat_client_spec.rb
View File

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