From bcfd47644ff980bdf3e7a7851f7399297bc36580 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 9 Jun 2021 16:16:45 +0200 Subject: [PATCH] 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 --- manifests/params.pp | 3 +-- spec/classes/mistral_client_spec.rb | 10 +--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index cf6b97f..ebebb41 100644 --- a/manifests/params.pp +++ b/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' diff --git a/spec/classes/mistral_client_spec.rb b/spec/classes/mistral_client_spec.rb index 4e0b411..dcbaffd 100644 --- a/spec/classes/mistral_client_spec.rb +++ b/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