openstack/puppet-watcher
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: Ic09a5a9b7edbdcea3ce1c4044df8a6819f076ff5
This commit is contained in:
Thomas Goirand 2021-06-14 09:42:17 +02:00
parent 39e76ce636
commit e04facd640
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

@ -3,10 +3,9 @@
class watcher::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$pyver3 = $::openstacklib::defaults::pyver3
$client_package_name = "python${pyvers}-watcherclient"
$client_package_name = 'python3-watcherclient'
$group = 'watcher'
case $::osfamily {

10
spec/classes/watcher_client_spec.rb
View File

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