diff options
| author | Luke Browning <lukebrowning@us.ibm.com> | 2017-12-08 10:03:11 -0600 |
|---|---|---|
| committer | Luke Browning <lukebrowning@us.ibm.com> | 2018-01-08 14:57:56 -0600 |
| commit | 36926f39e6ced5b6e5da5201975ff0194f4ed52a (patch) | |
| tree | bdac1b45786dba120bf2a6a568eef78a46eee18d /devstack | |
| parent | ccb6752f6973a7d1c8bb08675fde421710942998 (diff) | |
| download | trove-36926f39e6ced5b6e5da5201975ff0194f4ed52a.tar.gz | |
Add support for MySQL 5.7 on Ubuntu Xenial
Ubuntu Trusty continues to get MySQL 5.6.
The selection of the MySQL version is based on the version
of Ubuntu that is installed. If the script trovestack is
invoked on Xenial, the version that is chosen is 5.7. If
it is invoked on Trusty, then version 5.6 is chosen.
The only thing that is eliminated is the dubious combination
of MySQL 5.6 on Ubuntu Xenial. This combination is probably
not supported by Ubuntu as it is down level from their
standard offering is probably not tested anywhere.
Note Xenial does not provide the 5.6 version of mysql. This
was accomplished by initializing the Apt repo with the
Trusty software repository.
The size of the root file system is increased from 3 to 4 GBs
as the Mysql Xenial image does not fit in 3 GBs. This has an
impact on the flavors that are used by Trove for testing as the
name of the flavor includes the size of the root file system.
This is turn caused a change to each of the db specific test
config files as the trove falvors are referenced in them.
Change-Id: I4f4e497208b8f4728580e48239a8ae208e0a96dd
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/settings | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/devstack/settings b/devstack/settings index 45cd862c..44eaf0d7 100644 --- a/devstack/settings +++ b/devstack/settings @@ -26,9 +26,15 @@ TROVE_POLICY_JSON=${TROVE_POLICY_JSON:-${TROVE_CONF_DIR}/policy.json} TROVE_LOCAL_CONF_DIR=${TROVE_LOCAL_CONF_DIR:-${TROVE_DIR}/etc/trove} TROVE_LOCAL_API_PASTE_INI=${TROVE_LOCAL_API_PASTE_INI:-${TROVE_LOCAL_CONF_DIR}/api-paste.ini} TROVE_LOCAL_POLICY_JSON=${TROVE_LOCAL_POLICY_JSON:-${TROVE_LOCAL_CONF_DIR}/policy.json} + TROVE_DATASTORE_TYPE=${TROVE_DATASTORE_TYPE:-"mysql"} -TROVE_DATASTORE_VERSION=${TROVE_DATASTORE_VERSION:-"5.6"} -TROVE_DATASTORE_PACKAGE=${TROVE_DATASTORE_PACKAGE:-"mysql-server-5.6"} +if [ "$DISTRO" == "xenial" ]; then + TROVE_DATASTORE_VERSION=${TROVE_DATASTORE_VERSION:-"5.7"} + TROVE_DATASTORE_PACKAGE=${TROVE_DATASTORE_PACKAGE:-"mysql-server-5.7"} +else + TROVE_DATASTORE_VERSION=${TROVE_DATASTORE_VERSION:-"5.6"} + TROVE_DATASTORE_PACKAGE=${TROVE_DATASTORE_PACKAGE:-"mysql-server-5.6"} +fi # Configuration values listed here for reference TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE} |