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

manifests/db/sync.pp

@@ -18,11 +18,12 @@ class cloudkitty::db::sync(
 ) {
 
   include cloudkitty::deps
+  include cloudkitty::params
 
   exec { 'cloudkitty-db-sync':
     command     => "cloudkitty-dbsync upgrade ${extra_params}",
     path        => [ '/bin', '/usr/bin', ],
-    user        => 'cloudkitty',
+    user        => $::cloudkitty::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,

manifests/params.pp

@@ -8,6 +8,7 @@ class cloudkitty::params {
   $client_package_name    = 'python3-cloudkittyclient'
   $api_service_name       = 'cloudkitty-api'
   $processor_service_name = 'cloudkitty-processor'
+  $user                   = 'cloudkitty'
   $group                  = 'cloudkitty'
   $metrics_yaml           = '/etc/cloudkitty/metrics.yml'
 

manifests/wsgi/apache.pp

@@ -132,7 +132,7 @@ class cloudkitty::wsgi::apache (
   ::openstacklib::wsgi::apache { 'cloudkitty_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
-    group                       => 'cloudkitty',
+    group                       => $::cloudkitty::params::group,
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
@@ -145,7 +145,7 @@ class cloudkitty::wsgi::apache (
     ssl_crl_path                => $ssl_crl_path,
     ssl_key                     => $ssl_key,
     threads                     => $threads,
-    user                        => 'cloudkitty',
+    user                        => $::cloudkitty::params::user,
     workers                     => $workers,
     wsgi_daemon_process         => 'cloudkitty',
     wsgi_process_display_name   => $wsgi_process_display_name,