Update glance packages name for Fedora
For services starting from Fedora, RPM specs from [1] and repos [2] would be used. Do necessary changes in glance packages names. Also do not hard code packages name, instead take them from glance::params. [1] https://github.com/openstack/rpm-packaging/blob/master/openstack/glance/glance.spec.j2 [2] https://trunk.rdoproject.org/fedora/current/ Change-Id: Ibee5776116ebecf9f1e28632c4ab6317075ca868
This commit is contained in:
parent
b61ba344ee
commit
d3e1dd5529
|
@ -378,7 +378,7 @@ class glance::api(
|
|||
}
|
||||
|
||||
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
|
||||
ensure_packages('glance-api',
|
||||
ensure_packages($glance::params::api_package_name,
|
||||
{
|
||||
ensure => $package_ensure,
|
||||
tag => ['openstack', 'glance-package'],
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
class glance::params {
|
||||
include ::openstacklib::defaults
|
||||
|
||||
if ($::os_package_type == 'debian') {
|
||||
if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') {
|
||||
$pyvers = '3'
|
||||
} else {
|
||||
$pyvers = ''
|
||||
|
@ -16,8 +16,6 @@ class glance::params {
|
|||
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
$api_package_name = 'openstack-glance'
|
||||
$registry_package_name = 'openstack-glance'
|
||||
$api_service_name = 'openstack-glance-api'
|
||||
$registry_service_name = 'openstack-glance-registry'
|
||||
if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) {
|
||||
|
@ -25,6 +23,13 @@ class glance::params {
|
|||
} else {
|
||||
$pyceph_package_name = 'python-rbd'
|
||||
}
|
||||
if ($::operatingsystem != 'Fedora') {
|
||||
$api_package_name = 'openstack-glance'
|
||||
$registry_package_name = 'openstack-glance'
|
||||
} else {
|
||||
$api_package_name = 'openstack-glance-api'
|
||||
$registry_package_name = 'openstack-glance-registry'
|
||||
}
|
||||
}
|
||||
'Debian': {
|
||||
$api_package_name = 'glance-api'
|
||||
|
|
|
@ -156,7 +156,7 @@ class glance::registry(
|
|||
include ::glance::registry::db
|
||||
|
||||
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
|
||||
ensure_packages( 'glance-registry',
|
||||
ensure_packages($glance::params::registry_package_name,
|
||||
{
|
||||
ensure => $package_ensure,
|
||||
tag => ['openstack', 'glance-package'],
|
||||
|
|
|
@ -29,7 +29,11 @@ describe 'glance::client' do
|
|||
{ :client_package_name => 'python-glanceclient' }
|
||||
end
|
||||
when 'RedHat'
|
||||
{ :client_package_name => 'python-glanceclient' }
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{ :client_package_name => 'python3-glanceclient' }
|
||||
else
|
||||
{ :client_package_name => 'python-glanceclient' }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue