openstack/puppet-openstacklib
Code Issues Proposed changes

Install python3-openstackclient in Fedora or RedHat > 7

Browse Source 
Fedora repo [1] has python3 packages, start consuming those.

[1] http://trunk.rdoproject.org/fedora/current/

Change-Id: I8e2ec45e38275fb0910f5921662cb7cf865edd0a
This commit is contained in:
yatin 2018-10-05 19:25:44 +05:30
parent 6b1a928e51
commit 20ac1f925a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/params.pp
View File

@ -5,8 +5,11 @@
#
class openstacklib::params {
$openstackclient_package_name = $::os_package_type ? {
'debian' => 'python3-openstackclient',
default => 'python-openstackclient',
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$openstackclient_package_name = "python${pyvers}-openstackclient"
}

3
spec/classes/openstacklib_openstackclient_spec.rb
View File

@ -35,7 +35,8 @@ describe 'openstacklib::openstackclient' do
end
let(:platform_params) do
if facts[:os_package_type] == 'debian' then
if facts[:os_package_type] == 'debian' or (facts[:os_package_type] == 'rpm' \
and facts[:operatingsystemrelease].to_i > 7) then
openstackclient_package_name = 'python3-openstackclient'
else
openstackclient_package_name = 'python-openstackclient'