diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-07-08 15:52:11 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-07-09 16:52:55 +0200 |
| commit | 69b8b7a49fd682bb15ff84fd0b322dc6c21b5007 (patch) | |
| tree | 36c3b14a86249355a8859756c43735b670a61e54 | |
| parent | 5c08a191e401c0b1cc5646d1fd3386b2b72cad24 (diff) | |
| download | kolla-69b8b7a49fd682bb15ff84fd0b322dc6c21b5007.tar.gz kolla-69b8b7a49fd682bb15ff84fd0b322dc6c21b5007.zip | |
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
| -rw-r--r-- | docker/ceilometer/ceilometer-notification/extend_start.sh | 2 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1884919-6be7e60872c5eb86.yaml | 6 |
2 files changed, 7 insertions, 1 deletions
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 diff --git a/releasenotes/notes/bug-1884919-6be7e60872c5eb86.yaml b/releasenotes/notes/bug-1884919-6be7e60872c5eb86.yaml new file mode 100644 index 000000000..85bf3476a --- /dev/null +++ b/releasenotes/notes/bug-1884919-6be7e60872c5eb86.yaml @@ -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>`__ |