From 4828d650b3c19e96438eaedd10a652b6aaff2aa0 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 20 Feb 2022 19:11:43 +0900
Subject: [PATCH] Avoid hard-coding OS user/group in each manifest

and replace hard-codes by definition in params.pp .

Change-Id: If76bc4202133742fe47140238d065a080d5a4a66
---
 manifests/db/sync.pp     | 3 ++-
 manifests/params.pp      | 1 +
 manifests/wsgi/apache.pp | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 70c8880..8d530ee 100644
--- a/manifests/db/sync.pp
+++ b/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,
diff --git a/manifests/params.pp b/manifests/params.pp
index e8ddfad..a039d62 100644
--- a/manifests/params.pp
+++ b/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'
 
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index bf76780..4cbb4f8 100644
--- a/manifests/wsgi/apache.pp
+++ b/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,