diff options
| -rw-r--r-- | docker/monasca/monasca-log-api/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | docker/monasca/monasca-log-api/extend_start.sh | 19 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/remove-monasca-log-api-199dc88030284e71.yaml | 5 |
4 files changed, 5 insertions, 53 deletions
diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2 deleted file mode 100644 index 696a3f666..000000000 --- a/docker/monasca/monasca-log-api/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block monasca_log_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -ADD monasca-log-api-archive /monasca-log-api-source -RUN ln -s monasca-log-api-source/* monasca-log \ - && {{ macros.install_pip(['/monasca-log'] | customizable("pip_packages")) }} - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start -RUN chmod 755 /usr/local/bin/kolla_monasca_extend_start - -{% block monasca_log_api_footer %}{% endblock %} - -{% block footer %}{% endblock %} - - diff --git a/docker/monasca/monasca-log-api/extend_start.sh b/docker/monasca/monasca-log-api/extend_start.sh deleted file mode 100644 index 088ce5de1..000000000 --- a/docker/monasca/monasca-log-api/extend_start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -SERVICE="monasca-log-api" - -# When Apache first starts it writes out the custom log files with root -# ownership. This later prevents the Monasca Log API (which runs under the -# 'monasca' user) from updating them. To avoid this we create the log -# files with the required permissions here, before Apache does. -MONASCA_LOG_API_LOG_DIR="/var/log/kolla/monasca" -for LOG_TYPE in error access; do - if [ ! -f "${MONASCA_LOG_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log" ]; then - touch ${MONASCA_LOG_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log - fi - if [[ $(stat -c %U:%G ${MONASCA_LOG_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log) != "monasca:kolla" ]]; then - chown monasca:kolla ${MONASCA_LOG_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log - fi -done - -. /usr/local/bin/kolla_httpd_setup diff --git a/kolla/common/config.py b/kolla/common/config.py index 97ed4c973..5186f5b57 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -531,10 +531,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/monasca-api/' 'monasca-api-${openstack_branch}.tar.gz')}, - 'monasca-log-api': { - 'type': 'url', - 'location': ('$tarballs_base/monasca-log-api/' - 'monasca-log-api-${openstack_branch}.tar.gz')}, 'monasca-notification': { 'type': 'url', 'location': ('$tarballs_base/monasca-notification/' diff --git a/releasenotes/notes/remove-monasca-log-api-199dc88030284e71.yaml b/releasenotes/notes/remove-monasca-log-api-199dc88030284e71.yaml new file mode 100644 index 000000000..d077f9e49 --- /dev/null +++ b/releasenotes/notes/remove-monasca-log-api-199dc88030284e71.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The Monasca Log API merged into the Monasca API codebase in the Train + release and the monasca-log-api image has therefore been removed. |