openstack
/
puppet-magnum
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2022-02-22 16:22:29 +00:00 committed by Gerrit Code Review
parent ec3a55f784 ebbb4abff1
commit a1f3ee916e
3 changed files with 6 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

@ -28,11 +28,12 @@ class magnum::db::sync(
) { ) {
include magnum::deps include magnum::deps
include magnum::params
exec { 'magnum-db-sync': exec { 'magnum-db-sync':
command => "magnum-db-manage ${extra_params} upgrade head", command => "magnum-db-manage ${extra_params} upgrade head",
path => $exec_path, path => $exec_path,
user => $user, user => $::magnum::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

2
manifests/params.pp
View File

@ -5,7 +5,9 @@
class magnum::params { class magnum::params {
include openstacklib::defaults include openstacklib::defaults
$user = 'magnum'
$group = 'magnum' $group = 'magnum'
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
# package names # package names

4
manifests/wsgi/apache.pp
View File

@ -123,7 +123,7 @@ class magnum::wsgi::apache (
::openstacklib::wsgi::apache { 'magnum_wsgi': ::openstacklib::wsgi::apache { 'magnum_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => 'magnum', group => $::magnum::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@ -136,7 +136,7 @@ class magnum::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 => 'magnum', user => $::magnum::params::user,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'magnum', wsgi_daemon_process => 'magnum',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,