openstack/puppet-octavia
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: I65aeab82eb4f62834be3162e9ce2bd3655bc315a
This commit is contained in:
Thomas Goirand 2021-05-21 12:09:49 +02:00
parent 9448a98907
commit 0221597f1b
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

@ -2,13 +2,12 @@
# #
class octavia::params { class octavia::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$api_service_name = 'octavia-api' $api_service_name = 'octavia-api'
$worker_service_name = 'octavia-worker' $worker_service_name = 'octavia-worker'
$health_manager_service_name = 'octavia-health-manager' $health_manager_service_name = 'octavia-health-manager'
$housekeeping_service_name = 'octavia-housekeeping' $housekeeping_service_name = 'octavia-housekeeping'
$client_package_name = "python${pyvers}-octaviaclient" $client_package_name = 'python3-octaviaclient'
$group = 'octavia' $group = 'octavia'
case $::osfamily { case $::osfamily {

10
spec/classes/octavia_client_spec.rb
View File

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