From 69b8b7a49fd682bb15ff84fd0b322dc6c21b5007 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Wed, 8 Jul 2020 15:52:11 +0200 Subject: Fix ceilometer-upgrade params It seems [1] has introduced a slight regression in that it tries by default to pass an empty string to ceilometer-upgrade which makes it fail: ceilometer-upgrade: error: unrecognized arguments: (note there is nothing more on that line) This patch fixes that by allowing the params to be of any number, including zero. Backport to Ussuri. [1] 3d587409ee068843cfa28710f09f65af48b69367 Change-Id: I989a1dd30d1656b5c1fda7a46abbf5f265fbb72c Closes-Bug: #1884919 --- docker/ceilometer/ceilometer-notification/extend_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/ceilometer/ceilometer-notification/extend_start.sh b/docker/ceilometer/ceilometer-notification/extend_start.sh index cf2813f54..3a012cb1d 100644 --- a/docker/ceilometer/ceilometer-notification/extend_start.sh +++ b/docker/ceilometer/ceilometer-notification/extend_start.sh @@ -4,7 +4,7 @@ # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then - ceilometer-upgrade "${CEILOMETER_UPGRADE_PARAMS}" + ceilometer-upgrade ${CEILOMETER_UPGRADE_PARAMS} else echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}" exit 1 -- cgit v1.2.3