diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 2d468de..ba9c658 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -12,11 +12,12 @@ class zaqar::db::sync( ) { include zaqar::deps + include zaqar::params exec { 'zaqar-db-sync': command => 'zaqar-sql-db-manage upgrade head', path => '/usr/bin', - user => 'zaqar', + user => $::zaqar::params::user, refreshonly => true, try_sleep => 5, tries => 10, diff --git a/manifests/params.pp b/manifests/params.pp index 0a5bcd2..4a22901 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -8,6 +8,7 @@ class zaqar::params { $pyver3 = $::openstacklib::defaults::pyver3 $client_package_name = 'python3-zaqarclient' + $user = 'zaqar' $group = 'zaqar' case $::osfamily { diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index e56869c..fc2f91a 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -132,7 +132,7 @@ class zaqar::wsgi::apache ( ::openstacklib::wsgi::apache { 'zaqar_wsgi': bind_host => $bind_host, bind_port => $port, - group => 'zaqar', + group => $::zaqar::params::group, path => $path, priority => $priority, servername => $servername, @@ -145,7 +145,7 @@ class zaqar::wsgi::apache ( ssl_crl_path => $ssl_crl_path, ssl_key => $ssl_key, threads => $threads, - user => 'zaqar', + user => $::zaqar::params::user, workers => $workers, wsgi_daemon_process => 'zaqar-server', wsgi_process_display_name => $wsgi_process_display_name,