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