openstack/puppet-zaqar
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 20:10:59 +00:00 committed by Gerrit Code Review
commit ebcec456e5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/db/sync.pp
View File

@ -12,11 +12,12 @@ class zaqar::db::sync(
) {
include zaqar::deps
include zaqar::params
exec { 'zaqar-db-sync':
command => 'zaqar-sql-db-manage upgrade head',
path => '/usr/bin',
user => 'zaqar',
user => $::zaqar::params::user,
refreshonly => true,
try_sleep => 5,
tries => 10,

1
manifests/params.pp
View File

@ -8,6 +8,7 @@ class zaqar::params {
$pyver3 = $::openstacklib::defaults::pyver3
$client_package_name = 'python3-zaqarclient'
$user = 'zaqar'
$group = 'zaqar'
case $::osfamily {

4
manifests/wsgi/apache.pp
View File

@ -132,7 +132,7 @@ class zaqar::wsgi::apache (
::openstacklib::wsgi::apache { 'zaqar_wsgi':
bind_host => $bind_host,
bind_port => $port,
group => 'zaqar',
group => $::zaqar::params::group,
path => $path,
priority => $priority,
servername => $servername,
@ -145,7 +145,7 @@ class zaqar::wsgi::apache (
ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key,
threads => $threads,
user => 'zaqar',
user => $::zaqar::params::user,
workers => $workers,
wsgi_daemon_process => 'zaqar-server',
wsgi_process_display_name => $wsgi_process_display_name,