Remove Monasca Log API

Monasca, since the Train release has supported a unified API for both
logs and metrics. The Log API is no longer required.

Change-Id: I5a59a84b00a1770bfaf7257295e82bb5b92df029
This commit is contained in:
Doug Szumski 2020-05-14 15:16:06 +01:00
parent 3e74662ad8
commit aabd532da9
4 changed files with 5 additions and 53 deletions

View File

@ -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 %}

View File

@ -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

View File

@ -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/'

View File

@ -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.