summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-03-27 21:57:27 +1300
committerLingxian Kong <anlin.kong@gmail.com>2019-03-28 10:32:26 +0000
commit6ea816312e48b9ea05e497147e488bc6ec7ac24d (patch)
tree91727167efbe71a279c6c9b80a0c34c3c5d5be1f /devstack
parentc590106f79e2644283526a8739042206e0fa4301 (diff)
downloadtrove-6ea816312e48b9ea05e497147e488bc6ec7ac24d.tar.gz
Fix tests for Ubuntu Bionic migration of CI jobs
Change-Id: I2fee668c3774f7e87ce3478ca998f8b366c6cd41
Diffstat (limited to 'devstack')
-rw-r--r--devstack/settings2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/settings b/devstack/settings
index 5462654d..35852c7a 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -31,7 +31,7 @@ TROVE_LOCAL_API_PASTE_INI=${TROVE_LOCAL_API_PASTE_INI:-${TROVE_LOCAL_CONF_DIR}/a
TROVE_LOCAL_POLICY_JSON=${TROVE_LOCAL_POLICY_JSON:-${TROVE_LOCAL_CONF_DIR}/policy.json}
TROVE_DATASTORE_TYPE=${TROVE_DATASTORE_TYPE:-"mysql"}
-if [ "$DISTRO" == "xenial" ]; then
+if [[ "$DISTRO" == "xenial" || "$DISTRO" == "bionic" ]]; then
TROVE_DATASTORE_VERSION=${TROVE_DATASTORE_VERSION:-"5.7"}
TROVE_DATASTORE_PACKAGE=${TROVE_DATASTORE_PACKAGE:-"mysql-server-5.7"}
else