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

manifests/db/sync.pp

@@ -28,11 +28,12 @@ class magnum::db::sync(
 ) {
 
   include magnum::deps
+  include magnum::params
 
   exec { 'magnum-db-sync':
     command     => "magnum-db-manage ${extra_params} upgrade head",
     path        => $exec_path,
-    user        => $user,
+    user        => $::magnum::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,

manifests/params.pp

@@ -5,7 +5,9 @@
 class magnum::params {
   include openstacklib::defaults
 
+  $user  = 'magnum'
   $group = 'magnum'
+
   case $::osfamily {
     'RedHat': {
       # package names

manifests/wsgi/apache.pp

@@ -123,7 +123,7 @@ class magnum::wsgi::apache (
   ::openstacklib::wsgi::apache { 'magnum_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
-    group                       => 'magnum',
+    group                       => $::magnum::params::group,
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
@@ -136,7 +136,7 @@ class magnum::wsgi::apache (
     ssl_crl_path                => $ssl_crl_path,
     ssl_key                     => $ssl_key,
     threads                     => $threads,
-    user                        => 'magnum',
+    user                        => $::magnum::params::user,
     workers                     => $workers,
     wsgi_daemon_process         => 'magnum',
     wsgi_process_display_name   => $wsgi_process_display_name,