openstack/puppet-barbican
Code Issues Proposed changes

Merge "Avoid hard-coding OS user/group in each manifest"

Browse Source
This commit is contained in:
Zuul 2022-02-22 16:40:48 +00:00 committed by Gerrit Code Review
commit ec8178fcce
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@ -327,7 +327,7 @@ class barbican::api (
ensure => directory,
mode => '0770',
owner => 'root',
group => 'barbican',
group => $::barbican::params::group,
require => Anchor['barbican::install::end'],
notify => Anchor['barbican::service::end'],
}

5
manifests/db/sync.pp
View File

@ -24,11 +24,12 @@ class barbican::db::sync(
) {
include barbican::deps
include barbican::params
exec { 'barbican-db-manage':
command => "barbican-manage db upgrade ${extra_params}",
path => ['/bin', '/usr/bin', ],
user => 'barbican',
user => $::barbican::params::user,
refreshonly => true,
try_sleep => 5,
tries => 10,
@ -46,7 +47,7 @@ class barbican::db::sync(
exec { 'barbican-db-manage sync secret stores':
command => "barbican-manage db sync_secret_stores ${secret_store_extra_params}",
path => ['/bin', '/usr/bin', ],
user => 'barbican',
user => $::barbican::params::user,
refreshonly => true,
try_sleep => 5,
tries => 10,

1
manifests/params.pp
View File

@ -6,6 +6,7 @@ class barbican::params {
include openstacklib::defaults
$client_package_name = 'python3-barbicanclient'
$user = 'barbican'
$group = 'barbican'
$dogtag_client_package = 'pki-base'

4
manifests/wsgi/apache.pp
View File

@ -143,7 +143,7 @@ class barbican::wsgi::apache (
openstacklib::wsgi::apache { 'barbican_wsgi_main':
bind_host => $bind_host,
bind_port => $public_port,
group => 'barbican',
group => $::barbican::params::group,
path => $public_path,
priority => $priority,
servername => $servername,
@ -156,7 +156,7 @@ class barbican::wsgi::apache (
ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key,
threads => $threads,
user => 'barbican',
user => $::barbican::params::user,
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers,
wsgi_daemon_process => 'barbican-api',