Merge "Inherit pyvers from openstacklib::defaults"
This commit is contained in:
commit
f54faaf004
|
@ -2,13 +2,7 @@
|
||||||
#
|
#
|
||||||
class glare::params {
|
class glare::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 = ''
|
|
||||||
}
|
|
||||||
|
|
||||||
$group = 'glare'
|
$group = 'glare'
|
||||||
$client_package_name = "python${pyvers}-glareclient"
|
$client_package_name = "python${pyvers}-glareclient"
|
||||||
|
@ -18,9 +12,9 @@ class glare::params {
|
||||||
$glare_package_name = 'openstack-glare'
|
$glare_package_name = 'openstack-glare'
|
||||||
$glare_service_name = 'openstack-glare-api'
|
$glare_service_name = 'openstack-glare-api'
|
||||||
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${pyvers}-ceph"
|
||||||
} else {
|
} else {
|
||||||
$pyceph_package_name = 'python-rbd'
|
$pyceph_package_name = "python${pyvers}-rbd"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
|
|
|
@ -27,11 +27,7 @@ describe 'glare::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-glareclient' }
|
||||||
{ :client_package_name => 'python3-glareclient' }
|
|
||||||
else
|
|
||||||
{ :client_package_name => 'python-glareclient' }
|
|
||||||
end
|
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :client_package_name => 'python-glareclient' }
|
{ :client_package_name => 'python-glareclient' }
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue