From 0c71f2d8ea9fbb661b09c0a35c7b135596e9635c Mon Sep 17 00:00:00 2001
From: Hui Kang <kangh@us.ibm.com>
Date: Fri, 10 Jun 2016 23:12:40 -0400
Subject: [PATCH] Fix missing ceilometer user in the sudoers list for binary
type
ceilometer user and extend_start.sh should be added to both source
and binary type
Change-Id: I149e27e31c6eb200b508e5b67a98edccc8d86962
closes-Bug: #1582062
---
docker/ceilometer/ceilometer-base/Dockerfile.j2 | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index b637e41256..2d68254973 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -29,14 +29,13 @@ RUN ln -s ceilometer-base-source/* ceilometer \
&& chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ceilometer/rootwrap.conf
+{% endif %}
+
COPY ceilometer_sudoers /etc/sudoers.d/ceilometer_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 750 /etc/sudoers.d \
+RUN usermod -a -G kolla ceilometer \
+ && chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/ceilometer_sudoers \
&& touch /usr/local/bin/kolla_ceilometer_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start
-
-{% endif %}
-
-RUN usermod -a -G kolla ceilometer