diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 5c483b2a..d498c9f2 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -3,7 +3,7 @@ # # [*user*] # (Optional) User to run dbsync command. -# Defaults to 'gnocchi' +# Defaults to $::gnocchi::params::user # # [*extra_opts*] # (Optional) String of extra command line parameters to append @@ -15,10 +15,10 @@ # Defaults to 300 # class gnocchi::db::sync ( - $user = 'gnocchi', + $user = $::gnocchi::params::user, $extra_opts = undef, $db_sync_timeout = 300, -){ +) inherits gnocchi::params { include gnocchi::deps diff --git a/manifests/params.pp b/manifests/params.pp index c1999a88..d35b91b4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -14,6 +14,7 @@ class gnocchi::params { $metricd_service_name = 'gnocchi-metricd' $statsd_package_name = 'gnocchi-statsd' $statsd_service_name = 'gnocchi-statsd' + $user = 'gnocchi' $group = 'gnocchi' $gnocchi_wsgi_script_source = '/usr/bin/gnocchi-api' $boto3_package_name = 'python3-boto3' diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index bf49ebe9..a088baae 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -142,7 +142,7 @@ class gnocchi::wsgi::apache ( ::openstacklib::wsgi::apache { 'gnocchi_wsgi': bind_host => $bind_host, bind_port => $port, - group => 'gnocchi', + group => $::gnocchi::params::group, path => $path, priority => $priority, servername => $servername, @@ -155,7 +155,7 @@ class gnocchi::wsgi::apache ( ssl_crl_path => $ssl_crl_path, ssl_key => $ssl_key, threads => $threads, - user => 'gnocchi', + user => $::gnocchi::params::user, vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'gnocchi',