From aabd532da9fe3cac64626d481c4b3113b5925e69 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 14 May 2020 15:16:06 +0100
Subject: 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
---
 docker/monasca/monasca-log-api/Dockerfile.j2   | 30 --------------------------
 docker/monasca/monasca-log-api/extend_start.sh | 19 ----------------
 2 files changed, 49 deletions(-)
 delete mode 100644 docker/monasca/monasca-log-api/Dockerfile.j2
 delete mode 100644 docker/monasca/monasca-log-api/extend_start.sh

(limited to 'docker')

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
-- 
cgit v1.2.3