Alex Lourie has uploaded a new change for review.

Change subject: packaging: service: run dwh service as an ovirt user
......................................................................

packaging: service: run dwh service as an ovirt user

Change-Id: I5dcf067725e787dc5ea3c158900e57203eef50fe
Bug-Url: https://bugzilla.redhat.com/772001
Signed-off-by: Alex Lourie <[email protected]>
---
M data-warehouse/history_etl/history_service/ovirt-engine-dwhd
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/11/17311/1

diff --git a/data-warehouse/history_etl/history_service/ovirt-engine-dwhd 
b/data-warehouse/history_etl/history_service/ovirt-engine-dwhd
index 18bc6d1..a5eb451 100644
--- a/data-warehouse/history_etl/history_service/ovirt-engine-dwhd
+++ b/data-warehouse/history_etl/history_service/ovirt-engine-dwhd
@@ -29,6 +29,8 @@
 RETVAL=0
 PID_FOLDER=/var/run/ovirt-engine/
 LOG_FOLDER=/var/log/ovirt-engine/
+OVIRT_USER=ovirt
+
 
 #create the log directory
 if [ ! -d LOG_FOLDER ]; then
@@ -41,11 +43,6 @@
 
 # Path to the ovirt-engine-dwhd launch script
 ETL_SCRIPT=/usr/share/ovirt-engine-dwh/etl/history_service.sh
-
-# if oVirt_USER is not set, use root
-if [ -z "$oVirt_USER" ]; then
-    oVirt_USER="root"
-fi
 
 if [ -z "$SHUTDOWN_WAIT" ]; then
     SHUTDOWN_WAIT=10
@@ -76,7 +73,7 @@
     fi
     rm -f /usr/share/ovirt-engine-dwh/etl/kill > /dev/null 2>&1
     echo -n $"Starting $prog: at $(date)"
-    daemon --user $oVirt_USER ETL_PID=$ETL_PID $ETL_SCRIPT > /dev/null 2>&1
+    daemon --user $OVIRT_USER ETL_PID=$ETL_PID $ETL_SCRIPT > /dev/null 2>&1
     RETVAL=$?
     sleep 10
     pid=0
@@ -168,7 +165,7 @@
             rm -f $lock_file $ETL_PID
         fi
     else
-        pid="$(pgrep -fu $oVirt_USER 
ovirt_engine_dwh\.historyetl_3_3\.HistoryETL)"
+        pid="$(pgrep -fu $OVIRT_USER 
ovirt_engine_dwh\.historyetl_3_3\.HistoryETL)"
         if [ -n "$pid" ]; then
             echo "ETL service $0 running (${pid}) but no PID file exists"
             RETVAL="0"


-- 
To view, visit http://gerrit.ovirt.org/17311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dcf067725e787dc5ea3c158900e57203eef50fe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to