Skip to content
Snippets Groups Projects
Commit a7034692 authored by Hui Kang's avatar Hui Kang
Browse files

Add missing extend_start files for ceilometer container

Change-Id: I927c0593fc6b669d760b3744a5e77c532a164ca5
closes-Bug: #1571274
Partially-Implements: blueprint ansible-ceilometer
parent 0786e6b1
No related branches found
No related tags found
No related merge requests found
......@@ -17,8 +17,8 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start
RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start
{{ include_footer }}
......
......@@ -4,5 +4,6 @@
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
ceilometer-manage db_sync
sudo chown -R ceilometer: /var/lib/ceilometer/
exit 0
fi
......@@ -29,6 +29,14 @@ 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
COPY ceilometer_sudoers /etc/sudoers.d/ceilometer_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN 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
%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R ceilometer\: /var/lib/ceilometer/, /bin/chown -R ceilometer\: /var/lib/ceilometer/
#!/bin/bash
if [[ ! -d "/var/log/kolla/ceilometer" ]]; then
mkdir -p /var/log/kolla/ceilometer
fi
if [[ $(stat -c %a /var/log/kolla/ceilometer) != "755" ]]; then
chmod 755 /var/log/kolla/ceilometer
fi
source /usr/local/bin/kolla_ceilometer_extend_start
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment