From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 28 Aug 2015 12:16:53 +0000 Subject: Move docker_templates to docker dir Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir --- docker/ceilometer/ceilometer-api/Dockerfile.j2 | 18 ++++++++++++++++++ docker/ceilometer/ceilometer-api/config-external.sh | 10 ++++++++++ docker/ceilometer/ceilometer-api/start.sh | 21 +++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 docker/ceilometer/ceilometer-api/Dockerfile.j2 create mode 100644 docker/ceilometer/ceilometer-api/config-external.sh create mode 100755 docker/ceilometer/ceilometer-api/start.sh (limited to 'docker/ceilometer/ceilometer-api') diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 new file mode 100644 index 000000000..805e5e8eb --- /dev/null +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -0,0 +1,18 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +{% if install_type == 'binary' %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + +RUN yum install -y openstack-ceilometer-api \ + && yum clean all + + {% endif %} +{% endif %} + +COPY ./start.sh / +COPY config-external.sh /opt/kolla/ + +CMD ["/start.sh"] + +{{ include_footer }} diff --git a/docker/ceilometer/ceilometer-api/config-external.sh b/docker/ceilometer/ceilometer-api/config-external.sh new file mode 100644 index 000000000..2835bd5aa --- /dev/null +++ b/docker/ceilometer/ceilometer-api/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/ceilometer/ceilometer.conf" +TARGET="/etc/ceilometer/ceilometer.conf" +OWNER="ceilometer" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh new file mode 100755 index 000000000..0f660e025 --- /dev/null +++ b/docker/ceilometer/ceilometer-api/start.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/ceilometer-api" +ARGS="" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Config-internal script exec out of this function, it does not return here. +set_configs + +# 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 + su -s /bin/sh -c "ceilometer-manage db_sync" ceilometer + exit 0 +fi + +exec $CMD $ARGS -- cgit v1.2.3