openstack/kolla
Code Issues Proposed changes

Fix ceilometer-upgrade params

Browse Source 
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] 3d587409ee

Change-Id: I989a1dd30d1656b5c1fda7a46abbf5f265fbb72c
Closes-Bug: #1884919
This commit is contained in:
Radosław Piliszek 2020-07-08 15:52:11 +02:00
parent 5c08a191e4
commit 69b8b7a49f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
if [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then if [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then
ceilometer-upgrade "${CEILOMETER_UPGRADE_PARAMS}" ceilometer-upgrade ${CEILOMETER_UPGRADE_PARAMS}
else else
echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}" echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}"
exit 1 exit 1

6
releasenotes/notes/bug-1884919-6be7e60872c5eb86.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes Ceilometer deployment and upgrade failing due to wrong mode of
argument passing applied to the ``ceilometer-upgrade`` command.
`LP#1884919 <https://launchpad.net/bugs/1884919>`__