From d48492d84a5047d077e3654201ddeba7f7fd0042 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 9 Jun 2021 16:14:50 +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: I6095e9aa5f9c6dcd07e246d78f86ff2ef5660fa4 --- manifests/params.pp | 3 +-- spec/classes/freezer_client_spec.rb | 10 +--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 452ab04..8345879 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,11 +2,10 @@ # class freezer::params { include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers $api_deploy_method = 'apache' $api_bind_port = '9090' - $client_package = "python${pyvers}-freezerclient" + $client_package = 'python3-freezerclient' $freezer_db_backend = 'elasticsearch' $db_sync_command = 'freezer-manage db sync' $group = 'freezer' diff --git a/spec/classes/freezer_client_spec.rb b/spec/classes/freezer_client_spec.rb index 0006016..8b91529 100644 --- a/spec/classes/freezer_client_spec.rb +++ b/spec/classes/freezer_client_spec.rb @@ -27,15 +27,7 @@ describe 'freezer::client' do when 'Debian' { :client_package_name => 'python3-freezerclient' } when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package_name => 'python3-freezerclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package_name => 'python3-freezerclient' } - else - { :client_package_name => 'python-freezerclient' } - end - end + { :client_package_name => 'python3-freezerclient' } end end