openstack/puppet-panko
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Change-Id: I77a1eef4c2c9403c4cf37417030d8bc24281bc02
This commit is contained in:
Tobias Urdin 2019-01-17 21:49:27 +01:00
parent 4140826105
commit f9afc8fa1e
2 changed files with 2 additions and 12 deletions
manifests
params.pp
spec/classes
panko_client_spec.rb

8
manifests/params.pp

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

4
spec/classes/panko_client_spec.rb

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