openstack
/
puppet-placement
Code Issues Proposed changes

Get rid of the $pyvers variable 

Since everyone has switched to Python3, it's time for the removal of the
$pyvers variable.

Change-Id: Ib369975e3c852919765deebd09a5fa74dd78808a
This commit is contained in:
Thomas Goirand 2021-05-21 12:25:13 +02:00
parent bb3dc8c1f1
commit 517c3d6fe7
3 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/params.pp
View File

@ -5,12 +5,6 @@ class placement::params {
include placement::deps include placement::deps
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$pyvers_real = $pyvers ? {
'' => '2',
default => $pyvers
}
$group = 'placement' $group = 'placement'
case $::osfamily { case $::osfamily {
@ -18,8 +12,8 @@ class placement::params {
# package names # package names
$package_name = 'openstack-placement-api' $package_name = 'openstack-placement-api'
$common_package_name = 'openstack-placement-common' $common_package_name = 'openstack-placement-common'
$python_package_name = "python${pyvers_real}-placement" $python_package_name = 'python3-placement'
$osc_package_name = "python${pyvers_real}-osc-placement" $osc_package_name = 'python3-osc-placement'
$service_name = false $service_name = false
$public_url = 'http://127.0.0.1/placement' $public_url = 'http://127.0.0.1/placement'
$internal_url = 'http://127.0.0.1/placement' $internal_url = 'http://127.0.0.1/placement'
@ -31,8 +25,8 @@ class placement::params {
'Debian': { 'Debian': {
$package_name = 'placement-api' $package_name = 'placement-api'
$common_package_name = 'placement-common' $common_package_name = 'placement-common'
$python_package_name = "python${pyvers_real}-placement" $python_package_name = 'python3-placement'
$osc_package_name = "python${pyvers_real}-osc-placement" $osc_package_name = 'python3-osc-placement'
case $::os_package_type { case $::os_package_type {
'debian': { 'debian': {
$service_name = 'placement-api' $service_name = 'placement-api'

10
spec/classes/placement_client_spec.rb
View File

@ -31,15 +31,7 @@ describe 'placement::client' do
when 'Debian' when 'Debian'
{ :client_package_name => 'python3-osc-placement' } { :client_package_name => 'python3-osc-placement' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora' { :client_package_name => 'python3-osc-placement' }
{ :client_package_name => 'python3-osc-placement' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-osc-placement' }
else
{ :client_package_name => 'python2-osc-placement' }
end
end
end end
end end

22
spec/classes/placement_init_spec.rb
View File

@ -76,24 +76,10 @@ describe 'placement' do
:common_package_name => 'placement-common', :common_package_name => 'placement-common',
} }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora' {
{ :python_package_name => 'python3-placement',
:python_package_name => 'python3-placement', :common_package_name => 'openstack-placement-common',
:common_package_name => 'openstack-placement-common', }
}
else
if facts[:operatingsystemmajrelease] > '7'
{
:python_package_name => 'python3-placement',
:common_package_name => 'openstack-placement-common',
}
else
{
:python_package_name => 'python2-placement',
:common_package_name => 'openstack-placement-common',
}
end
end
end end
end end