From ebfc0a7bf8da8ea27e5a7527859c201dacf7c5e5 Mon Sep 17 00:00:00 2001
From: Dincer Celik <hello@dincercelik.com>
Date: Sun, 26 Apr 2020 17:45:02 +0300
Subject: [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
---
 docker/rally/extend_start.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'docker')

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
-- 
cgit v1.2.3