aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca/monasca-api
diff options
context:
space:
mode:
authorDoug Szumski <doug@stackhpc.com>2018-04-03 13:29:34 +0100
committerDoug Szumski <doug@stackhpc.com>2018-06-08 16:06:14 +0100
commit14e1aff964f72a34b93d74727f3b14b5e89d62ca (patch)
tree705237f66ea965206eef6cdebbd6bcb324245166 /docker/monasca/monasca-api
parent91f5cca1863bb54695774a892c83ccb2ffaf9006 (diff)
downloadkolla-14e1aff964f72a34b93d74727f3b14b5e89d62ca.tar.gz
kolla-14e1aff964f72a34b93d74727f3b14b5e89d62ca.zip
Update Monasca base and API images
* Support deploying APIs via Apache + mod_wsgi * Include InfluxDB client so that the Monasca API can talk to InfluxDB. Support for Cassandra can be added in a later commit. Change-Id: If71db99d4731967e814c5263f2c2d6f90391c2a6 Partially-Implements: blueprint monasca-containers
Diffstat (limited to 'docker/monasca/monasca-api')
-rw-r--r--docker/monasca/monasca-api/Dockerfile.j218
-rw-r--r--docker/monasca/monasca-api/extend_start.sh42
2 files changed, 57 insertions, 3 deletions
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index a66c5481a..e9f7b5235 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -12,9 +12,21 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% set monasca_api_packages = [
+ 'mariadb',
+ ] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% set monasca_api_packages = [
+ 'mariadb-client',
+ ] %}
+ {% endif %}
+{{ macros.install_packages(monasca_api_packages | customizable("packages")) }}
+
ADD monasca-api-archive /monasca-api-source
{% set monasca_api_pip_packages = [
+ 'influxdb',
'/monasca-api'
] %}
@@ -23,9 +35,9 @@ RUN ln -s monasca-api-source/* monasca-api \
{% endif %}
+COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start
+RUN chmod 755 /usr/local/bin/kolla_monasca_extend_start
+
{% block monasca_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
-
-USER monasca
-
diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh
new file mode 100644
index 000000000..6152e416a
--- /dev/null
+++ b/docker/monasca/monasca-api/extend_start.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+SERVICE="monasca-api"
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+ # Set the database name in the monasca database schema
+ sed "s/USE \`mon\`;/USE \`${MONASCA_DATABASE_NAME}\`;/g" \
+ /monasca-api/devstack/files/schema/mon_mysql.sql > /tmp/mon_mysql.sql
+ # Load the schema
+ mysql --host=${MONASCA_DATABASE_ADDRESS} \
+ --port=${MONASCA_DATABASE_PORT} \
+ --user=${MONASCA_DATABASE_USER} \
+ --password=${MONASCA_DATABASE_PASSWORD} \
+ < /tmp/mon_mysql.sql
+ exit 0
+fi
+
+# NOTE(pbourke): httpd will not clean up after itself in some cases which
+# results in the container not being able to restart. (bug #1489676, 1557036)
+if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+ # Loading Apache2 ENV variables
+ . /etc/apache2/envvars
+ rm -rf /var/run/apache2/*
+else
+ rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
+fi
+
+# When Apache first starts it writes out the custom log files with root
+# ownership. This later prevents the Monasca 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_API_LOG_DIR="/var/log/kolla/monasca"
+for LOG_TYPE in error access; do
+ if [ ! -f "${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log" ]; then
+ touch ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log
+ fi
+ if [[ $(stat -c %U:%G ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log) != "monasca:kolla" ]]; then
+ chown monasca:kolla ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log
+ fi
+done