From d3efbd07dc4d6095089666011dc79ac3bcae8036 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Mon, 23 Nov 2015 08:51:39 +0530
Subject: Drop root for ceilometer

Updates to ensure commands run in the ceilometer containers
are done as the 'ceilometer' user rather than root.

Change-Id: Ic94b876a002d4413f2038c29ffdb275c68323065
Partially-Implements: blueprint drop-root
---
 docker/ceilometer/ceilometer-api/Dockerfile.j2   | 2 ++
 docker/ceilometer/ceilometer-api/extend_start.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker/ceilometer/ceilometer-api')

diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index 40c6dc788..fabc4ffa6 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
@@ -14,3 +14,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
+
+USER ceilometer
diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh
index 5e38e555d..108ef33ec 100644
--- a/docker/ceilometer/ceilometer-api/extend_start.sh
+++ b/docker/ceilometer/ceilometer-api/extend_start.sh
@@ -3,6 +3,6 @@
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    sudo -H -u ceilometer ceilometer-manage db_sync
+    ceilometer-manage db_sync
     exit 0
 fi
-- 
cgit v1.2.3