openstack/puppet-vitrage
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: I718e97030f67ab257295de6db04696726efd4f5f
This commit is contained in:
Takashi Kajinami 2022-02-21 01:51:16 +09:00
parent 26f0e1f90e
commit acb97eff1e
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

@ -18,11 +18,12 @@ class vitrage::db::sync(
) { ) {
include vitrage::deps include vitrage::deps
include vitrage::params
exec { 'vitrage-db-sync': exec { 'vitrage-db-sync':
command => "vitrage-dbsync ${extra_params}", command => "vitrage-dbsync ${extra_params}",
path => '/usr/bin', path => '/usr/bin',
user => 'vitrage', user => $::vitrage::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

1
manifests/params.pp
View File

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

4
manifests/wsgi/apache.pp
View File

@ -137,7 +137,7 @@ class vitrage::wsgi::apache (
::openstacklib::wsgi::apache { 'vitrage_wsgi': ::openstacklib::wsgi::apache { 'vitrage_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => 'vitrage', group => $::vitrage::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@ -150,7 +150,7 @@ class vitrage::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 => 'vitrage', user => $::vitrage::params::user,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'vitrage', wsgi_daemon_process => 'vitrage',
wsgi_process_group => 'vitrage', wsgi_process_group => 'vitrage',