openstack
/
puppet-vitrage
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults 

Change-Id: Ie30a1e4583de5b76a0e6af900d43090a53387b66
This commit is contained in:
Tobias Urdin 2019-01-17 22:07:47 +01:00
parent 8d11cff893
commit 33c8094fdc
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -4,13 +4,7 @@
#
class vitrage::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-vitrageclient"
$group = 'vitrage'

6
spec/classes/vitrage_client_spec.rb
View File

@ -26,11 +26,7 @@ describe 'vitrage::client' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-vitrageclient' }
else
{ :client_package_name => 'python-vitrageclient' }
end
{ :client_package_name => 'python3-vitrageclient' }
when 'RedHat'
{ :client_package_name => 'python-vitrageclient' }
end