openstack/kolla-ansible
Code Issues Proposed changes

Fix missing ceilometer user in the sudoers list for binary type

Browse Source 
ceilometer user and extend_start.sh should be added to both source
and binary type

Change-Id: I149e27e31c6eb200b508e5b67a98edccc8d86962
closes-Bug: #1582062
This commit is contained in:
Hui Kang 2016-06-10 23:12:40 -04:00
parent 31089795da
commit 0c71f2d8ea
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -29,14 +29,13 @@ RUN ln -s ceilometer-base-source/* ceilometer \
&& chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/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 && 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 ceilometer_sudoers /etc/sudoers.d/ceilometer_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start 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 \ && chmod 440 /etc/sudoers.d/ceilometer_sudoers \
&& touch /usr/local/bin/kolla_ceilometer_extend_start \ && touch /usr/local/bin/kolla_ceilometer_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /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