diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-16 08:54:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-16 08:54:54 +0000 |
| commit | b5635df2875b9677f4f64d6c945b778e51662b38 (patch) | |
| tree | bc24ffb6180934b0eeefceca36da73139a476804 /docker | |
| parent | 835c197a58f7b96b65606c7ff231e1bdd028f5b1 (diff) | |
| parent | a13b4fbfcf84d8efbf8560ccd2da70cdc5549607 (diff) | |
| download | kolla-b5635df2875b9677f4f64d6c945b778e51662b38.tar.gz kolla-b5635df2875b9677f4f64d6c945b778e51662b38.zip | |
Merge "Fix potential Monasca-thresh start failure"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/monasca/monasca-thresh/extend_start.sh | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 7138d4f0b..31c4abdd0 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -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 %} diff --git a/docker/monasca/monasca-thresh/extend_start.sh b/docker/monasca/monasca-thresh/extend_start.sh new file mode 100644 index 000000000..77e835d44 --- /dev/null +++ b/docker/monasca/monasca-thresh/extend_start.sh @@ -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 |