diff --git a/manifests/cron/db_purge.pp b/manifests/cron/db_purge.pp index f633e3fc..bc0266f7 100644 --- a/manifests/cron/db_purge.pp +++ b/manifests/cron/db_purge.pp @@ -36,7 +36,7 @@ # # [*user*] # (optional) User with access to manila files. -# Defaults to 'manila'. +# Defaults to $::manila::params::user. # # [*age*] # (optional) Number of days prior to today for deletion, @@ -61,11 +61,11 @@ class manila::cron::db_purge ( $monthday = '*', $month = '*', $weekday = '*', - $user = 'manila', + $user = $::manila::params::user, $age = 0, $destination = '/var/log/manila/manila-rowsflush.log', $maxdelay = 0, -) { +) inherits manila::params { include manila::deps diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 82792bc7..761a67e0 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -11,13 +11,13 @@ class manila::db::sync( $db_sync_timeout = 300, ) { - include manila::params include manila::deps + include manila::params exec { 'manila-manage db_sync': command => $::manila::params::db_sync_command, path => '/usr/bin', - user => 'manila', + user => $::manila::params::user, refreshonly => true, try_sleep => 5, tries => 10, diff --git a/manifests/params.pp b/manifests/params.pp index e4fe48eb..9d6dadc8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,10 +5,11 @@ class manila::params { include openstacklib::defaults - $client_package = 'python3-manilaclient' - $db_sync_command = 'manila-manage db sync' - $lio_package_name = 'targetcli' - $group = 'manila' + $client_package = 'python3-manilaclient' + $db_sync_command = 'manila-manage db sync' + $lio_package_name = 'targetcli' + $user = 'manila' + $group = 'manila' case $::osfamily { 'Debian': { diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index b9235785..cbe94ffa 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -142,7 +142,7 @@ class manila::wsgi::apache ( ::openstacklib::wsgi::apache { 'manila_wsgi': bind_host => $bind_host, bind_port => $port, - group => 'manila', + group => $::manila::params::group, path => $path, priority => $priority, servername => $servername, @@ -155,7 +155,7 @@ class manila::wsgi::apache ( ssl_crl_path => $ssl_crl_path, ssl_key => $ssl_key, threads => $threads, - user => 'manila', + user => $::manila::params::user, vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'manila-api',