openstack/puppet-zaqar
Code Issues Proposed changes

Avoid hard-coding OS user/group in each manifest

Browse Source 
and replace hard-codes by definition in params.pp .

Change-Id: Iadd122b33ac826902468541263f87176a556bd30
This commit is contained in:
Takashi Kajinami 2022-02-21 01:44:32 +09:00
parent abc8b1ff74
commit b25f7f6277
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::deps
include zaqar::params
exec { 'zaqar-db-sync': exec { 'zaqar-db-sync':
command => 'zaqar-sql-db-manage upgrade head', command => 'zaqar-sql-db-manage upgrade head',
path => '/usr/bin', path => '/usr/bin',
user => 'zaqar', user => $::zaqar::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

1
manifests/params.pp
View File

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

4
manifests/wsgi/apache.pp
View File

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