openstack/puppet-vitrage
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: I44895d8fcae71a48b7f74aa25e9b7c1a170db379
This commit is contained in:
Thomas Goirand 2021-06-14 09:47:12 +02:00
parent 59b6f57ac1
commit e8c63f4ecf
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,10 +4,9 @@
#
class vitrage::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$pyver3 = $::openstacklib::defaults::pyver3
$client_package_name = "python${pyvers}-vitrageclient"
$client_package_name = 'python3-vitrageclient'
$group = 'vitrage'
case $::osfamily {

10
spec/classes/vitrage_client_spec.rb
View File

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