diff options
| author | caoyuan <cao.yuan@99cloud.net> | 2017-10-31 22:01:13 +0800 |
|---|---|---|
| committer | caoyuan <cao.yuan@99cloud.net> | 2017-12-14 20:11:19 +0800 |
| commit | cd679300a2b47547164ab9d63240c8b806d128e0 (patch) | |
| tree | 074e8f4af29a04ac0e472ae79dd21f999a25278a /docker/ceilometer/ceilometer-notification | |
| parent | 3a5503f83c22be867f74a8d131d6ed91ea54e7b1 (diff) | |
| download | kolla-cd679300a2b47547164ab9d63240c8b806d128e0.tar.gz kolla-cd679300a2b47547164ab9d63240c8b806d128e0.zip | |
Remove the ceilometer api dockerfile
1. Ceilometer API has been deprecated since Ocata release,
this patch to remove it for kolla
2. move the extend_start.sh into eilometer-notification
Change-Id: Iea0a46aead14e238fe102d4127b7774dbc2be0e4
Diffstat (limited to 'docker/ceilometer/ceilometer-notification')
| -rw-r--r-- | docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-notification/extend_start.sh | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 64e1c4b01..f6318104d 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -16,6 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start +RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start + {% block ceilometer_notification_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/extend_start.sh b/docker/ceilometer/ceilometer-notification/extend_start.sh new file mode 100644 index 000000000..281cce3fa --- /dev/null +++ b/docker/ceilometer/ceilometer-notification/extend_start.sh @@ -0,0 +1,26 @@ +#!/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 |