summaryrefslogtreecommitdiff
path: root/integration/scripts
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2020-10-13 23:51:46 +1300
committerLingxian Kong <anlin.kong@gmail.com>2020-10-23 23:50:39 +1300
commitd1af33f17b0994ac1d0ca5acca91f2f29bc82ce9 (patch)
tree03d0da87c98820a21b1d4c87523df90410bf3e89 /integration/scripts
parent4df3dceeeee8d92f1c876effa4375f88e3249bca (diff)
downloadtrove-d1af33f17b0994ac1d0ca5acca91f2f29bc82ce9.tar.gz
Support mysql 8.0
* MySQL 5.7 and MySQL 8.0 need different percona-xtrabackup package version. Added Percona XtraBackup 8 support for MySQL 8.x backup and restore. * Construct different backup container image names for MySQL 5.7 and MySQL 8.0 based on the default option value. * Two docker images are uploaded for backup/restore: openstacktrove/db-backup-mysql5.7:1.0.0 and openstacktrove/db-backup-mysql8.0:1.0.0. Trove guest agent can automatically choose the approriate one based on the datastore version. * Added option "secure-file-priv=NULL" in MySQL config template to fix https://github.com/docker-library/mysql/issues/541. * Stop using IDENTIFIED BY in GRANT clause (also REVOKE). Starting with MySQL 8 creating a user implicitly using the GRANT command is not supported. Story: #2008275 Task: #41143 Change-Id: Ibdec63324b1b39ba9b8a38dbe529da17bbb06767
Diffstat (limited to 'integration/scripts')
-rwxr-xr-xintegration/scripts/trovestack6
1 files changed, 4 insertions, 2 deletions
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 1c121f9d..4e6742a1 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -525,7 +525,7 @@ function cmd_set_datastore() {
rd_manage datastore_update "$datastore" ""
# trove-manage datastore_version_update <datastore_name> <version_name> <datastore_manager> <image_id> <image_tags> <packages> <active>
- rd_manage datastore_version_update "${DATASTORE_TYPE}" "${DATASTORE_VERSION}" "${DATASTORE_TYPE}" $IMAGEID "" "" 1
+ rd_manage datastore_version_update "${DATASTORE_TYPE}" "${DATASTORE_VERSION}" "${DATASTORE_TYPE}" ${IMAGEID} "trove" "" 1
rd_manage datastore_update "${DATASTORE_TYPE}" "${DATASTORE_VERSION}"
if [[ -f "$PATH_TROVE"/trove/templates/${DATASTORE_TYPE}/validation-rules.json ]]; then
@@ -766,7 +766,9 @@ function cmd_build_and_upload_image() {
local output_dir=${5:-"$HOME/images"}
name=trove-guest-${guest_os}-${guest_release}
- glance_imageid=$(openstack ${CLOUD_ADMIN_ARG} image list --name $name -f value -c ID)
+ glance_imageid=$(openstack ${CLOUD_ADMIN_ARG} image list \
+ --tag trove --sort created_at:desc \
+ -f value -c ID | awk 'NR==1 {print}')
if [[ -z ${glance_imageid} ]]; then
mkdir -p ${output_dir}
output=${output_dir}/${name}.qcow2