openstack/puppet-trove
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: Iebaeb757d2b989f8307a47f57d7aff6071527836
This commit is contained in:
Thomas Goirand 2021-06-14 09:37:56 +02:00
parent b07c761623
commit 4d2d6bfe8e
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 trove::params { class trove::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-troveclient" $client_package_name = 'python3-troveclient'
$group = 'trove' $group = 'trove'
case $::osfamily { case $::osfamily {

8
spec/classes/trove_client_spec.rb
View File

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