openstack
/
kolla
Code Issues Proposed changes

Merge "Fix potential Monasca-thresh start failure"

This commit is contained in:
Zuul 2018-10-16 08:54:54 +00:00 committed by Gerrit Code Review
parent 835c197a58 a13b4fbfcf
commit b5635df287
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -64,6 +64,11 @@ RUN cd /monasca-common-source/java \
{% endif %}
# Overwrite the script inherited from Storm
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_monasca_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_monasca_extend_start
{% block monasca_thresh_footer %}{% endblock %}
{% block footer %}{% endblock %}

15
docker/monasca/monasca-thresh/extend_start.sh Normal file
View File

@ -0,0 +1,15 @@
#!/bin/bash
# Create log directory, with appropriate permissions
MONASCA_LOG_DIR="/var/log/kolla/monasca"
if [[ ! -d "$MONASCA_LOG_DIR" ]]; then
mkdir -p $MONASCA_LOG_DIR
fi
if [[ $(stat -c %U:%G ${MONASCA_LOG_DIR}) != "monasca:kolla" ]]; then
chown monasca:kolla ${MONASCA_LOG_DIR}
fi
if [[ $(stat -c %a ${MONASCA_LOG_DIR}) != "755" ]]; then
chmod 755 ${MONASCA_LOG_DIR}
fi
. /usr/local/bin/kolla_monasca_extend_start