Browse Source

Get rid of the $pyvers variable

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

Change-Id: I51b3fb2c00faa2a5cbe54109594908a4dbb40e67
changes/50/795550/2
Thomas Goirand 4 months ago
parent
commit
bcfd47644f
  1. 3
      manifests/params.pp
  2. 10
      spec/classes/mistral_client_spec.rb

3
manifests/params.pp

@ -4,9 +4,8 @@
#
class mistral::params {
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_populate_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf populate'
$group = 'mistral'

10
spec/classes/mistral_client_spec.rb

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

Loading…
Cancel
Save