openstack
/
puppet-glance
Code Issues Proposed changes

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:
yatin 2018-06-25 17:52:59 +05:30 committed by Daniel Pawlik
parent 2602c0bb91
commit af35a97553
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

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

16
manifests/params.pp
View File

@ -3,7 +3,12 @@
class glance::params {
include ::openstacklib::defaults
$client_package_name = 'python-glanceclient'
if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') {
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package_name = "python${pyvers}-glanceclient"
$cache_cleaner_command = 'glance-cache-cleaner'
$cache_pruner_command = 'glance-cache-pruner'
@ -11,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) {
@ -20,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'],

17
spec/classes/glance_client_spec.rb
View File

@ -20,6 +20,23 @@ describe 'glance::client' do
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-glanceclient' }
else
{ :client_package_name => 'python-glanceclient' }
end
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package_name => 'python3-glanceclient' }
else
{ :client_package_name => 'python-glanceclient' }
end
end
end
it_configures 'glance client'
end
end