diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index d58984e0..ace86c30 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -3,16 +3,16 @@ # # [*user*] # (Optional) User to run dbsync command. -# Defaults to 'aodh' +# Defaults to $::aodh::params::user # # [*db_sync_timeout*] # (Optional) Timeout for the execution of the db_sync # Defaults to 300 # class aodh::db::sync ( - $user = 'aodh', + $user = $::aodh::params::user, $db_sync_timeout = 300, -){ +) inherits aodh::params { include aodh::deps diff --git a/manifests/expirer.pp b/manifests/expirer.pp index d35a949d..80f04fd3 100644 --- a/manifests/expirer.pp +++ b/manifests/expirer.pp @@ -73,7 +73,7 @@ class aodh::expirer ( ensure => $ensure, command => "${sleep}${aodh::params::expirer_command}", environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh', - user => 'aodh', + user => $::aodh::params::user, minute => $minute, hour => $hour, monthday => $monthday, diff --git a/manifests/params.pp b/manifests/params.pp index 26de5d62..4edf393b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,6 +4,7 @@ class aodh::params { include openstacklib::defaults $client_package_name = 'python3-aodhclient' + $user = 'aodh' $group = 'aodh' $expirer_command = 'aodh-expirer' diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 644a5f13..4b686f11 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -154,7 +154,7 @@ class aodh::wsgi::apache ( openstacklib::wsgi::apache { 'aodh_wsgi': bind_host => $bind_host, bind_port => $port, - group => 'aodh', + group => $::aodh::params::group, path => $path, priority => $priority, servername => $servername, @@ -167,7 +167,7 @@ class aodh::wsgi::apache ( ssl_crl_path => $ssl_crl_path, ssl_key => $ssl_key, threads => $threads, - user => 'aodh', + user => $::aodh::params::user, vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'aodh',