From 1eaa37a0c7d8696edb1c9c34c760176cbb4983c5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 21 Feb 2022 01:49:40 +0900
Subject: [PATCH] Avoid hard-coding OS user/group in each manifest

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

Change-Id: I3d419faaa33935476b705a58dac949fb7ae97eba
---
 manifests/db/create_schema.pp | 3 ++-
 manifests/db/upgrade.pp       | 3 ++-
 manifests/params.pp           | 1 +
 manifests/wsgi/apache.pp      | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifests/db/create_schema.pp b/manifests/db/create_schema.pp
index 4537493..9e40da2 100644
--- a/manifests/db/create_schema.pp
+++ b/manifests/db/create_schema.pp
@@ -13,11 +13,12 @@ class watcher::db::create_schema(
 ) {
 
   include watcher::deps
+  include watcher::params
 
   exec { 'watcher-db-manage-create_schema':
     command     => "watcher-db-manage ${extra_params} create_schema",
     path        => '/usr/bin',
-    user        => 'watcher',
+    user        => $::watcher::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,
diff --git a/manifests/db/upgrade.pp b/manifests/db/upgrade.pp
index a06b7ca..9dc79db 100644
--- a/manifests/db/upgrade.pp
+++ b/manifests/db/upgrade.pp
@@ -14,11 +14,12 @@ class watcher::db::upgrade(
 ) {
 
   include watcher::deps
+  include watcher::params
 
   exec { 'watcher-db-manage-upgrade':
     command     => "watcher-db-manage ${extra_params} upgrade",
     path        => '/usr/bin',
-    user        => 'watcher',
+    user        => $::watcher::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,
diff --git a/manifests/params.pp b/manifests/params.pp
index 30bdc54..df9f378 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,6 +4,7 @@ class watcher::params {
   include openstacklib::defaults
 
   $client_package_name = 'python3-watcherclient'
+  $user                = 'watcher'
   $group               = 'watcher'
 
   case $::osfamily {
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index b851d73..96dae40 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -132,7 +132,7 @@ class watcher::wsgi::apache (
   ::openstacklib::wsgi::apache { 'watcher_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
-    group                       => 'watcher',
+    group                       => $::watcher::params::group,
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
@@ -145,7 +145,7 @@ class watcher::wsgi::apache (
     ssl_crl_path                => $ssl_crl_path,
     ssl_key                     => $ssl_key,
     threads                     => $threads,
-    user                        => 'watcher',
+    user                        => $::watcher::params::user,
     workers                     => $workers,
     wsgi_daemon_process         => 'watcher',
     wsgi_process_display_name   => $wsgi_process_display_name,