Merge "Centralize user/group definition"

This commit is contained in:
Zuul 2024-10-21 15:42:00 +00:00 committed by Gerrit Code Review
commit 2014fe5bcb
3 changed files with 5 additions and 3 deletions

View File

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

View File

@ -5,6 +5,7 @@ class placement::params {
include placement::deps include placement::deps
include openstacklib::defaults include openstacklib::defaults
$user = 'placement'
$group = 'placement' $group = 'placement'
case $facts['os']['family'] { case $facts['os']['family'] {

View File

@ -167,7 +167,7 @@ class placement::wsgi::apache (
::openstacklib::wsgi::apache { 'placement_wsgi': ::openstacklib::wsgi::apache { 'placement_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => 'placement', group => $::placement::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@ -180,7 +180,7 @@ class placement::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 => 'placement', user => $::placement::params::user,
vhost_custom_fragment => $vhost_custom_fragment, vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'placement-api', wsgi_daemon_process => 'placement-api',