openstack/puppet-barbican
Code Issues Proposed changes

retry_scheduler: Simplify package/service check

Browse Source 
... 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 784c7fd120
2 changed files with 28 additions and 29 deletions
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' $worker_service_name = 'barbican-worker'
$keystone_listener_package_name = 'barbican-keystone-listener' $keystone_listener_package_name = 'barbican-keystone-listener'
$keystone_listener_service_name = 'barbican-keystone-listener' $keystone_listener_service_name = 'barbican-keystone-listener'
$retry_package_name = false $retry_package_name = undef
$retry_service_name = false $retry_service_name = undef
$barbican_wsgi_script_path = '/usr/lib/cgi-bin/barbican' $barbican_wsgi_script_path = '/usr/lib/cgi-bin/barbican'
$barbican_wsgi_script_source = '/usr/bin/barbican-wsgi-api' $barbican_wsgi_script_source = '/usr/bin/barbican-wsgi-api'
} }

11
manifests/retry_scheduler.pp
View File

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