openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Update glance packages name for Fedora"

This commit is contained in:
Zuul 2018-07-03 20:11:55 +00:00 committed by Gerrit Code Review
parent efa0f486bd d3e1dd5529
commit 4f5667170f
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@ -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'],

11
manifests/params.pp
View File

@ -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'

2
manifests/registry.pp
View File

@ -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'],

6
spec/classes/glance_client_spec.rb
View File

@ -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