diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-14 20:26:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-14 20:26:02 +0000 |
| commit | c27381e6fb970da299d99a6199c9c741530fd74c (patch) | |
| tree | 9fc747c7b1dae738daba3c875314d5a7496a13fc /docker/ceilometer/ceilometer-api | |
| parent | 9245418a240b8b65ebd994c6ff1494a9a397fc25 (diff) | |
| parent | cd679300a2b47547164ab9d63240c8b806d128e0 (diff) | |
| download | kolla-c27381e6fb970da299d99a6199c9c741530fd74c.tar.gz kolla-c27381e6fb970da299d99a6199c9c741530fd74c.zip | |
Merge "Remove the ceilometer api dockerfile"
Diffstat (limited to 'docker/ceilometer/ceilometer-api')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-api/extend_start.sh | 26 |
2 files changed, 0 insertions, 36 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 deleted file mode 100644 index b53e5911e..000000000 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ /dev/null @@ -1,10 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block ceilometer_api_header %}{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start -RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start - -{% block ceilometer_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh deleted file mode 100644 index 281cce3fa..000000000 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# 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 - if [[ "${CEILOMETER_DATABASE_TYPE}" == "mysql" ]]; then - sudo -H -u ceilometer ceilometer-upgrade --skip-gnocchi-resource-types - elif [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then - sudo -H -u ceilometer ceilometer-upgrade --skip-metering-database - elif [[ "${CEILOMETER_DATABASE_TYPE}" == "mongodb" ]]; then - echo "Ceilometer doesn't need to initialize a database when MongoDB is configured as the database back end." - else - echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}" - exit 1 - fi - sudo chown -R ceilometer: /var/lib/ceilometer/ - exit 0 -fi - -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 |