diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-13 07:48:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-13 07:48:00 +0000 |
| commit | 3c7b0ea7b48f425451a90f1486cd07a7979bc204 (patch) | |
| tree | bd13a5a831ec41e8399c34b89d819ca2cf1a8488 /docker | |
| parent | 63df185ab7ca85eae7c70da06ec9b47906eeb49d (diff) | |
| parent | 603a7338795c611eca587dd27aa6ccd37396e898 (diff) | |
| download | kolla-3c7b0ea7b48f425451a90f1486cd07a7979bc204.tar.gz kolla-3c7b0ea7b48f425451a90f1486cd07a7979bc204.zip | |
Merge "Fix ceilometer deployment"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-notification/extend_start.sh | 8 |
1 files changed, 2 insertions, 6 deletions
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 |