summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDincer Celik <hello@dincercelik.com>2020-04-26 17:45:02 +0300
committerDincer Celik <hello@dincercelik.com>2020-04-26 18:09:35 +0300
commitebfc0a7bf8da8ea27e5a7527859c201dacf7c5e5 (patch)
tree0bdb2c5999265b5f54224814b0c8c14c71f7e52f
parente22fb9796e0592d288310b23bd7245885f235cef (diff)
downloadkolla-ebfc0a7bf8da8ea27e5a7527859c201dacf7c5e5.tar.gz
kolla-ebfc0a7bf8da8ea27e5a7527859c201dacf7c5e5.zip
[rally] Fixes Ubuntu binary
This is a follow up for [1]. "rally-manage db" command was deprecated since 0.10.0 but Ubuntu ships 0.9.1 for Bionic. [1] https://bugs.launchpad.net/kolla/+bug/1856693 Closes-Bug: #1872283 Change-Id: I5fb0fc4e6a8bf7ab07abc9c78f0673e3e764b4d1
-rw-r--r--docker/rally/extend_start.sh8
-rw-r--r--releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml5
2 files changed, 12 insertions, 1 deletions
diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh
index 88f3d054f..6c1de1f11 100644
--- a/docker/rally/extend_start.sh
+++ b/docker/rally/extend_start.sh
@@ -10,6 +10,12 @@ fi
# 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
- rally db create || rally db upgrade
+ # NOTE(osmanlicilegi): "rally-manage db" command was deprecated since 0.10.0 but
+ # Ubuntu ships 0.9.1 for Bionic.
+ if [[ ${KOLLA_BASE_DISTRO} == "ubuntu" && ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
+ rally-manage db create || rally-manage db upgrade
+ else
+ rally db create || rally db upgrade
+ fi
exit 0
fi
diff --git a/releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml b/releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml
new file mode 100644
index 000000000..de84c1c49
--- /dev/null
+++ b/releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fixes Rally for Ubuntu binary deployment.
+ `LP#1872283 <https://launchpad.net/bugs/1872283>`__