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

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
 

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,

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'
 

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',