openstack
/
puppet-barbican
Code Issues Proposed changes

retry_scheduler: Simplify package/service check 

... by maintaining os-family handling in the centralized place.

Change-Id: Ib0cc4d0470296fa58fd89cc53bb982bd7424afbb
This commit is contained in:
Takashi Kajinami 2023-12-11 22:14:18 +09:00
parent 19f9032983
commit fcc4ad84a0
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -32,8 +32,8 @@ class barbican::params {
$worker_service_name = 'barbican-worker'
$keystone_listener_package_name = 'barbican-keystone-listener'
$keystone_listener_service_name = 'barbican-keystone-listener'
$retry_package_name = false
$retry_service_name = false
$retry_package_name = undef
$retry_service_name = undef
$barbican_wsgi_script_path = '/usr/lib/cgi-bin/barbican'
$barbican_wsgi_script_source = '/usr/bin/barbican-wsgi-api'
}

22
manifests/retry_scheduler.pp
View File

@ -40,15 +40,16 @@ class barbican::retry_scheduler (
'retry_scheduler/periodic_interval_max_seconds': value => $periodic_interval_max_seconds;
}
case $facts['os']['family'] {
'RedHat': {
package { 'barbican-retry':
ensure => $package_ensure,
name => $::barbican::params::retry_package_name,
tag => ['openstack', 'barbican-package'],
}
if $::barbican::params::retry_package_name {
package { 'barbican-retry':
ensure => $package_ensure,
name => $::barbican::params::retry_package_name,
tag => ['openstack', 'barbican-package'],
}
}
if $manage_service {
if $::barbican::params::retry_service_name {
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
@ -65,8 +66,7 @@ class barbican::retry_scheduler (
}
}
}
default: {
warning('barbican-retry package/service is not available')
}
} else {
warning('barbican-retry service is not available')
}
}