openstack
/
kolla
Code Issues Proposed changes

Merge "Fix ceilometer deployment"

This commit is contained in:
Zuul 2018-02-13 07:48:00 +00:00 committed by Gerrit Code Review
parent 63df185ab7 603a733879
commit 3c7b0ea7b4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/ceilometer/ceilometer-notification/extend_start.sh
View File

@ -3,12 +3,8 @@
# 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."
if [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then
ceilometer-upgrade
else
echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}"
exit 1