openstack/puppet-mistral
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: I51b3fb2c00faa2a5cbe54109594908a4dbb40e67
This commit is contained in:
Thomas Goirand 2021-06-09 16:16:45 +02:00
parent 0964a6bc24
commit bcfd47644f
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 mistral::params { class mistral::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-mistralclient" $client_package = 'python3-mistralclient'
$db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head' $db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head'
$db_populate_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf populate' $db_populate_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf populate'
$group = 'mistral' $group = 'mistral'

8
spec/classes/mistral_client_spec.rb
View File

@ -31,15 +31,7 @@ describe 'mistral::client' do
when 'Debian' when 'Debian'
{ :client_package => 'python3-mistralclient' } { :client_package => 'python3-mistralclient' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package => 'python3-mistralclient' } { :client_package => 'python3-mistralclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package => 'python3-mistralclient' }
else
{ :client_package => 'python-mistralclient' }
end
end
end end
end end