openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Install python3-rbd in Fedora and RedHat > 7"

This commit is contained in:
Zuul 2018-12-28 00:27:09 +00:00 committed by Gerrit Code Review
parent 546ff1931e eb778f4276
commit d74f80bdc2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -6,8 +6,10 @@ class glance::params {
if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
$_pyceph_package_name = 'python3-rbd'
} else {
$pyvers = ''
$_pyceph_package_name = 'python-rbd'
}
$client_package_name = "python${pyvers}-glanceclient"
@ -24,7 +26,7 @@ class glance::params {
if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) {
$pyceph_package_name = 'python-ceph'
} else {
$pyceph_package_name = 'python-rbd'
$pyceph_package_name = $_pyceph_package_name
}
}
'Debian': {