From 603a7338795c611eca587dd27aa6ccd37396e898 Mon Sep 17 00:00:00 2001 From: Alexandru Bogdan Pica Date: Fri, 9 Feb 2018 01:18:35 +0200 Subject: Fix ceilometer deployment This change fixes the following issues: - wrong sudoers command - bad arguments for ceilometer-upgrade - removes the deprecated storage backends, as per https://review.openstack.org/#/c/512700/ Please note that due to the aforementioned issues, ceilometer deployment was failing. I first encountered this issue when attempting to upgrade from pike to queens. Change-Id: Ibdfed9ea0a8e4aaf4fe3420a5885ea346998f1e7 Closes-Bug: 1741536 --- docker/ceilometer/ceilometer-notification/extend_start.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/ceilometer/ceilometer-notification/extend_start.sh b/docker/ceilometer/ceilometer-notification/extend_start.sh index 281cce3fa..630b60ecb 100644 --- a/docker/ceilometer/ceilometer-notification/extend_start.sh +++ b/docker/ceilometer/ceilometer-notification/extend_start.sh @@ -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 -- cgit v1.2.3