Merge "Do not define service resource when service management is disabled"

This commit is contained in:
Zuul 2022-01-10 20:18:52 +00:00 committed by Gerrit Code Review
commit b19934a74b
2 changed files with 46 additions and 54 deletions

View File

@ -436,15 +436,6 @@ class barbican::api (
}
}
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
}
# set value to have the server auto-create the database on startup
# instead of using db_sync
barbican_config { 'DEFAULT/db_auto_create': value => $db_auto_create }
@ -469,6 +460,13 @@ class barbican::api (
include barbican::db::sync
}
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
if $service_name == 'barbican-api' or $service_name == $::barbican::params::api_service_name {
if $::operatingsystem == 'Ubuntu' {
@ -516,6 +514,7 @@ deprecated and will be removed in a future release. Use openstack-barbican-api i
} else {
fail('Invalid service_name. Use barbican-api for stand-alone or httpd')
}
}
oslo::middleware { 'barbican_config':
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,

View File

@ -339,17 +339,10 @@ describe 'barbican::api' do
{
:manage_service => false,
:enabled => false,
:auth_strategy => 'keystone',
}
end
it { is_expected.to contain_service('barbican-api').with(
'ensure' => nil,
'enable' => false,
'hasstatus' => true,
'hasrestart' => true,
'tag' => 'barbican-service',
)}
it { is_expected.to_not contain_service('barbican-api') }
end
end
end