Improve the function tests

- Execute test groups in serial to make sure no more than 2 database
  instance are created at the same time.
- Remove some unneccesary tests
- Remove unneeded datastore, e.g. 'Test_Datastore_1'
- Remove unsupported trovestack subcommands
- Move unsupported DIB elements to the 'deprecated-elements' folder
- Decrease default value of 'agent_call_high_timeout' to 5min
- Add initial_deplay for pooling task
- Use socket file to connect with database instead of using localhost
  IP

Change-Id: Ie5030a671fbeb453eafa6cbe04e08da7b52e33c9

75 files changed, 74 insertions, 210 deletions

diff --git a/integration/scripts/conf/test_begin.conf b/integration/scripts/conf/test_begin.conf
index fa0a1e1f..c0b6c513 100644
--- a/integration/scripts/conf/test_begin.conf
+++ b/integration/scripts/conf/test_begin.conf
@@ -37,23 +37,11 @@
     ],
     "flavors": null,
     "white_box":false,
-    "start_services": %startservices%,
     "test_mgmt":false,
     "use_local_ovz":false,
     "use_venv":false,
-    "glance_code_root":"%glance_path%",
-    "glance_api_conf":"/vagrant/conf/glance-api.conf",
-    "glance_reg_conf":"/vagrant/conf/glance-reg.conf",
-    "glance_images_directory": "/glance_images",
-    "glance_image": "debian-squeeze-x86_64-openvz.tar.gz",
     "report_directory":"%report_directory%",
     "usr_bin_dir":"%bin_path%",
-    "nova_code_root":"%nova_path%",
-    "nova_conf":"/home/vagrant/nova.conf",
-    "keystone_code_root":"%keystone_path%",
-    "keystone_conf":"/etc/keystone/keystone.conf",
-    "keystone_use_combined":true,
-    "trove_code_root":"%trove_path%",
     "trove_conf":"/tmp/trove.conf",
     "trove_version":"v1.0",
     "trove_api_updated":"2012-08-01T00:00:00Z",
diff --git a/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep b/integration/scripts/files/deprecated-elements/fedora-guest/extra-data.d/15-trove-dep
index 2c4b8202..2c4b8202 100755
--- a/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/extra-data.d/15-trove-dep
diff --git a/integration/scripts/files/elements/fedora-guest/extra-data.d/20-guest-systemd b/integration/scripts/files/deprecated-elements/fedora-guest/extra-data.d/20-guest-systemd
index aeedfb6e..aeedfb6e 100755
--- a/integration/scripts/files/elements/fedora-guest/extra-data.d/20-guest-systemd
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/extra-data.d/20-guest-systemd
diff --git a/integration/scripts/files/elements/fedora-guest/extra-data.d/62-ssh-key b/integration/scripts/files/deprecated-elements/fedora-guest/extra-data.d/62-ssh-key
index 63453a75..63453a75 100755
--- a/integration/scripts/files/elements/fedora-guest/extra-data.d/62-ssh-key
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/extra-data.d/62-ssh-key
diff --git a/integration/scripts/files/elements/fedora-guest/install.d/15-trove-dep b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/15-trove-dep
index 3bda0565..3bda0565 100755
--- a/integration/scripts/files/elements/fedora-guest/install.d/15-trove-dep
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/15-trove-dep
diff --git a/integration/scripts/files/elements/fedora-guest/install.d/20-etc b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/20-etc
index bec065ef..bec065ef 100755
--- a/integration/scripts/files/elements/fedora-guest/install.d/20-etc
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/20-etc
diff --git a/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/21-use-fedora-certificates
index 8ef6c50a..8ef6c50a 100755
--- a/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/21-use-fedora-certificates
diff --git a/integration/scripts/files/elements/fedora-guest/install.d/50-user b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/50-user
index a4b666bf..a4b666bf 100755
--- a/integration/scripts/files/elements/fedora-guest/install.d/50-user
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/50-user
diff --git a/integration/scripts/files/elements/fedora-guest/install.d/62-ssh-key b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/62-ssh-key
index 80c1e65c..80c1e65c 100755
--- a/integration/scripts/files/elements/fedora-guest/install.d/62-ssh-key
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/62-ssh-key
diff --git a/integration/scripts/files/elements/fedora-guest/post-install.d/05-ipforwarding b/integration/scripts/files/deprecated-elements/fedora-guest/post-install.d/05-ipforwarding
index 4824cfcf..4824cfcf 100755
--- a/integration/scripts/files/elements/fedora-guest/post-install.d/05-ipforwarding
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/post-install.d/05-ipforwarding
diff --git a/integration/scripts/files/elements/fedora-guest/post-install.d/62-trove-guest-sudoers b/integration/scripts/files/deprecated-elements/fedora-guest/post-install.d/62-trove-guest-sudoers
index 0581fd2b..0581fd2b 100755
--- a/integration/scripts/files/elements/fedora-guest/post-install.d/62-trove-guest-sudoers
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/post-install.d/62-trove-guest-sudoers
diff --git a/integration/scripts/files/elements/fedora-guest/post-install.d/90-yum-update b/integration/scripts/files/deprecated-elements/fedora-guest/post-install.d/90-yum-update
index cd2992c1..cd2992c1 100755
--- a/integration/scripts/files/elements/fedora-guest/post-install.d/90-yum-update
+++ b/integration/scripts/files/deprecated-elements/fedora-guest/post-install.d/90-yum-update
diff --git a/integration/scripts/files/elements/fedora-mariadb/README.md b/integration/scripts/files/deprecated-elements/fedora-mariadb/README.md
index 757f00b8..757f00b8 100644
--- a/integration/scripts/files/elements/fedora-mariadb/README.md
+++ b/integration/scripts/files/deprecated-elements/fedora-mariadb/README.md
diff --git a/integration/scripts/files/elements/fedora-mariadb/install.d/10-mariadb b/integration/scripts/files/deprecated-elements/fedora-mariadb/install.d/10-mariadb
index a5cc2c0e..a5cc2c0e 100755
--- a/integration/scripts/files/elements/fedora-mariadb/install.d/10-mariadb
+++ b/integration/scripts/files/deprecated-elements/fedora-mariadb/install.d/10-mariadb
diff --git a/integration/scripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr b/integration/scripts/files/deprecated-elements/fedora-mariadb/pre-install.d/10-percona-copr
index bcc55205..bcc55205 100755
--- a/integration/scripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr
+++ b/integration/scripts/files/deprecated-elements/fedora-mariadb/pre-install.d/10-percona-copr
diff --git a/integration/scripts/files/elements/fedora-mongodb/README.md b/integration/scripts/files/deprecated-elements/fedora-mongodb/README.md
index 2518abf2..2518abf2 100644
--- a/integration/scripts/files/elements/fedora-mongodb/README.md
+++ b/integration/scripts/files/deprecated-elements/fedora-mongodb/README.md
diff --git a/integration/scripts/files/elements/fedora-mongodb/install.d/10-mongodb b/integration/scripts/files/deprecated-elements/fedora-mongodb/install.d/10-mongodb
index 02ea9535..02ea9535 100755
--- a/integration/scripts/files/elements/fedora-mongodb/install.d/10-mongodb
+++ b/integration/scripts/files/deprecated-elements/fedora-mongodb/install.d/10-mongodb
diff --git a/integration/scripts/files/elements/fedora-mongodb/install.d/25-trove-mongo-dep b/integration/scripts/files/deprecated-elements/fedora-mongodb/install.d/25-trove-mongo-dep
index 7be7ef95..7be7ef95 100755
--- a/integration/scripts/files/elements/fedora-mongodb/install.d/25-trove-mongo-dep
+++ b/integration/scripts/files/deprecated-elements/fedora-mongodb/install.d/25-trove-mongo-dep
diff --git a/integration/scripts/files/elements/fedora-mysql/README.md b/integration/scripts/files/deprecated-elements/fedora-mysql/README.md
index 39a6ab8c..39a6ab8c 100644
--- a/integration/scripts/files/elements/fedora-mysql/README.md
+++ b/integration/scripts/files/deprecated-elements/fedora-mysql/README.md
diff --git a/integration/scripts/files/elements/fedora-mysql/install.d/10-mysql b/integration/scripts/files/deprecated-elements/fedora-mysql/install.d/10-mysql
index ff7efa36..ff7efa36 100755
--- a/integration/scripts/files/elements/fedora-mysql/install.d/10-mysql
+++ b/integration/scripts/files/deprecated-elements/fedora-mysql/install.d/10-mysql
diff --git a/integration/scripts/files/elements/fedora-mysql/install.d/40-xtrabackup b/integration/scripts/files/deprecated-elements/fedora-mysql/install.d/40-xtrabackup
index 9c9709ca..9c9709ca 100755
--- a/integration/scripts/files/elements/fedora-mysql/install.d/40-xtrabackup
+++ b/integration/scripts/files/deprecated-elements/fedora-mysql/install.d/40-xtrabackup
diff --git a/integration/scripts/files/elements/fedora-mysql/post-install.d/30-register-mysql-service b/integration/scripts/files/deprecated-elements/fedora-mysql/post-install.d/30-register-mysql-service
index a7db5d92..a7db5d92 100644
--- a/integration/scripts/files/elements/fedora-mysql/post-install.d/30-register-mysql-service
+++ b/integration/scripts/files/deprecated-elements/fedora-mysql/post-install.d/30-register-mysql-service
diff --git a/integration/scripts/files/elements/fedora-percona/install.d/05-percona-server b/integration/scripts/files/deprecated-elements/fedora-percona/install.d/05-percona-server
index 9c43c6ef..9c43c6ef 100755
--- a/integration/scripts/files/elements/fedora-percona/install.d/05-percona-server
+++ b/integration/scripts/files/deprecated-elements/fedora-percona/install.d/05-percona-server
diff --git a/integration/scripts/files/elements/fedora-percona/install.d/10-mysql b/integration/scripts/files/deprecated-elements/fedora-percona/install.d/10-mysql
index 284e81ac..284e81ac 100755
--- a/integration/scripts/files/elements/fedora-percona/install.d/10-mysql
+++ b/integration/scripts/files/deprecated-elements/fedora-percona/install.d/10-mysql
diff --git a/integration/scripts/files/elements/fedora-postgresql/install.d/10-postgresql b/integration/scripts/files/deprecated-elements/fedora-postgresql/install.d/10-postgresql
index 0872d6e4..0872d6e4 100755
--- a/integration/scripts/files/elements/fedora-postgresql/install.d/10-postgresql
+++ b/integration/scripts/files/deprecated-elements/fedora-postgresql/install.d/10-postgresql
diff --git a/integration/scripts/files/elements/fedora-redis/README.md b/integration/scripts/files/deprecated-elements/fedora-redis/README.md
index 426072cf..426072cf 100644
--- a/integration/scripts/files/elements/fedora-redis/README.md
+++ b/integration/scripts/files/deprecated-elements/fedora-redis/README.md
diff --git a/integration/scripts/files/elements/fedora-redis/install.d/10-redis b/integration/scripts/files/deprecated-elements/fedora-redis/install.d/10-redis
index 8c23b5f6..8c23b5f6 100755
--- a/integration/scripts/files/elements/fedora-redis/install.d/10-redis
+++ b/integration/scripts/files/deprecated-elements/fedora-redis/install.d/10-redis
diff --git a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra b/integration/scripts/files/deprecated-elements/ubuntu-cassandra/install.d/10-cassandra
index 77233f4c..77233f4c 100755
--- a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra
+++ b/integration/scripts/files/deprecated-elements/ubuntu-cassandra/install.d/10-cassandra
diff --git a/integration/scripts/files/elements/ubuntu-couchbase/install.d/10-couchbase b/integration/scripts/files/deprecated-elements/ubuntu-couchbase/install.d/10-couchbase
index 1303fdfd..1303fdfd 100755
--- a/integration/scripts/files/elements/ubuntu-couchbase/install.d/10-couchbase
+++ b/integration/scripts/files/deprecated-elements/ubuntu-couchbase/install.d/10-couchbase
diff --git a/integration/scripts/files/elements/ubuntu-couchdb/install.d/10-couchdb b/integration/scripts/files/deprecated-elements/ubuntu-couchdb/install.d/10-couchdb
index b53f7faa..b53f7faa 100755
--- a/integration/scripts/files/elements/ubuntu-couchdb/install.d/10-couchdb
+++ b/integration/scripts/files/deprecated-elements/ubuntu-couchdb/install.d/10-couchdb
diff --git a/integration/scripts/files/elements/ubuntu-db2/README.md b/integration/scripts/files/deprecated-elements/ubuntu-db2/README.md
index 56a3479b..56a3479b 100644
--- a/integration/scripts/files/elements/ubuntu-db2/README.md
+++ b/integration/scripts/files/deprecated-elements/ubuntu-db2/README.md
diff --git a/integration/scripts/files/elements/ubuntu-db2/extra-data.d/20-copy-db2-pkgs b/integration/scripts/files/deprecated-elements/ubuntu-db2/extra-data.d/20-copy-db2-pkgs
index f82fd32a..f82fd32a 100755
--- a/integration/scripts/files/elements/ubuntu-db2/extra-data.d/20-copy-db2-pkgs
+++ b/integration/scripts/files/deprecated-elements/ubuntu-db2/extra-data.d/20-copy-db2-pkgs
diff --git a/integration/scripts/files/elements/ubuntu-db2/install.d/10-db2 b/integration/scripts/files/deprecated-elements/ubuntu-db2/install.d/10-db2
index 4e87733b..4e87733b 100755
--- a/integration/scripts/files/elements/ubuntu-db2/install.d/10-db2
+++ b/integration/scripts/files/deprecated-elements/ubuntu-db2/install.d/10-db2
diff --git a/integration/scripts/files/elements/ubuntu-mongodb/README.md b/integration/scripts/files/deprecated-elements/ubuntu-mongodb/README.md
index 5b9e33bb..5b9e33bb 100644
--- a/integration/scripts/files/elements/ubuntu-mongodb/README.md
+++ b/integration/scripts/files/deprecated-elements/ubuntu-mongodb/README.md
diff --git a/integration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key b/integration/scripts/files/deprecated-elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key
index 06aba978..06aba978 100755
--- a/integration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key
+++ b/integration/scripts/files/deprecated-elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key
diff --git a/integration/scripts/files/elements/ubuntu-percona/install.d/30-mysql b/integration/scripts/files/deprecated-elements/ubuntu-percona/install.d/30-mysql
index d5a8ac5b..d5a8ac5b 100755
--- a/integration/scripts/files/elements/ubuntu-percona/install.d/30-mysql
+++ b/integration/scripts/files/deprecated-elements/ubuntu-percona/install.d/30-mysql
diff --git a/integration/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key b/integration/scripts/files/deprecated-elements/ubuntu-percona/pre-install.d/10-percona-apt-key
index 4e6ec1a5..4e6ec1a5 100755
--- a/integration/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
+++ b/integration/scripts/files/deprecated-elements/ubuntu-percona/pre-install.d/10-percona-apt-key
diff --git a/integration/scripts/files/elements/ubuntu-percona/pre-install.d/20-apparmor-mysql-local b/integration/scripts/files/deprecated-elements/ubuntu-percona/pre-install.d/20-apparmor-mysql-local
index a3e1dc7c..a3e1dc7c 100755
--- a/integration/scripts/files/elements/ubuntu-percona/pre-install.d/20-apparmor-mysql-local
+++ b/integration/scripts/files/deprecated-elements/ubuntu-percona/pre-install.d/20-apparmor-mysql-local
diff --git a/integration/scripts/files/elements/ubuntu-pxc/install.d/30-mysql b/integration/scripts/files/deprecated-elements/ubuntu-pxc/install.d/30-mysql
index d9f2f427..d9f2f427 100755
--- a/integration/scripts/files/elements/ubuntu-pxc/install.d/30-mysql
+++ b/integration/scripts/files/deprecated-elements/ubuntu-pxc/install.d/30-mysql
diff --git a/integration/scripts/files/elements/ubuntu-pxc/pre-install.d/10-percona-apt-key b/integration/scripts/files/deprecated-elements/ubuntu-pxc/pre-install.d/10-percona-apt-key
index 4e6ec1a5..4e6ec1a5 100755
--- a/integration/scripts/files/elements/ubuntu-pxc/pre-install.d/10-percona-apt-key
+++ b/integration/scripts/files/deprecated-elements/ubuntu-pxc/pre-install.d/10-percona-apt-key
diff --git a/integration/scripts/files/elements/ubuntu-pxc/pre-install.d/20-apparmor-mysql-local b/integration/scripts/files/deprecated-elements/ubuntu-pxc/pre-install.d/20-apparmor-mysql-local
index a3e1dc7c..a3e1dc7c 100755
--- a/integration/scripts/files/elements/ubuntu-pxc/pre-install.d/20-apparmor-mysql-local
+++ b/integration/scripts/files/deprecated-elements/ubuntu-pxc/pre-install.d/20-apparmor-mysql-local
diff --git a/integration/scripts/files/elements/ubuntu-redis/README.md b/integration/scripts/files/deprecated-elements/ubuntu-redis/README.md
index 426072cf..426072cf 100644
--- a/integration/scripts/files/elements/ubuntu-redis/README.md
+++ b/integration/scripts/files/deprecated-elements/ubuntu-redis/README.md
diff --git a/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis b/integration/scripts/files/deprecated-elements/ubuntu-redis/install.d/30-redis
index 24d60d2c..24d60d2c 100755
--- a/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis
+++ b/integration/scripts/files/deprecated-elements/ubuntu-redis/install.d/30-redis
diff --git a/integration/scripts/files/elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env b/integration/scripts/files/deprecated-elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env
index 088dc70c..088dc70c 100755
--- a/integration/scripts/files/elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env
+++ b/integration/scripts/files/deprecated-elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env
diff --git a/integration/scripts/files/elements/ubuntu-vertica/README.md b/integration/scripts/files/deprecated-elements/ubuntu-vertica/README.md
index 86202379..86202379 100644
--- a/integration/scripts/files/elements/ubuntu-vertica/README.md
+++ b/integration/scripts/files/deprecated-elements/ubuntu-vertica/README.md
diff --git a/integration/scripts/files/elements/ubuntu-vertica/extra-data.d/93-copy-vertica-deb b/integration/scripts/files/deprecated-elements/ubuntu-vertica/extra-data.d/93-copy-vertica-deb
index 56c02cda..56c02cda 100755
--- a/integration/scripts/files/elements/ubuntu-vertica/extra-data.d/93-copy-vertica-deb
+++ b/integration/scripts/files/deprecated-elements/ubuntu-vertica/extra-data.d/93-copy-vertica-deb
diff --git a/integration/scripts/files/elements/ubuntu-vertica/install.d/97-vertica b/integration/scripts/files/deprecated-elements/ubuntu-vertica/install.d/97-vertica
index 2af42834..2af42834 100755
--- a/integration/scripts/files/elements/ubuntu-vertica/install.d/97-vertica
+++ b/integration/scripts/files/deprecated-elements/ubuntu-vertica/install.d/97-vertica
diff --git a/integration/scripts/files/elements/ubuntu-xenial-cassandra/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-cassandra/element-deps
index 28898cf7..28898cf7 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-cassandra/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-cassandra/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-couchbase/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-couchbase/element-deps
index fa85fc7e..fa85fc7e 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-couchbase/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-couchbase/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-couchdb/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-couchdb/element-deps
index abd5561b..abd5561b 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-couchdb/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-couchdb/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/element-deps
index 6a5964ec..6a5964ec 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/10-mongodb-thp b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/10-mongodb-thp
index e949b06a..e949b06a 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/10-mongodb-thp
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/10-mongodb-thp
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/20-mongodb b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/20-mongodb
index 6320964f..6320964f 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/20-mongodb
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/20-mongodb
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep
index c0488bd0..c0488bd0 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/30-mongodb-conf b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/30-mongodb-conf
index 5ccf3259..5ccf3259 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/30-mongodb-conf
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/30-mongodb-conf
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/35-check-numa b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/35-check-numa
index 78162cf5..78162cf5 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/35-check-numa
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/35-check-numa
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/40-check-numa-systemd b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/40-check-numa-systemd
index b6f76858..b6f76858 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/40-check-numa-systemd
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/40-check-numa-systemd
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/41-mongod-systemd b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/41-mongod-systemd
index 257e45a8..257e45a8 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/41-mongod-systemd
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/41-mongod-systemd
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/42-mongos-systemd b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/42-mongos-systemd
index 5073a215..5073a215 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/42-mongos-systemd
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-mongodb/install.d/42-mongos-systemd
diff --git a/integration/scripts/files/elements/ubuntu-xenial-percona/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-percona/element-deps
index bc5f9af6..bc5f9af6 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-percona/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-percona/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-percona/post-install.d/10-fix-mycnf b/integration/scripts/files/deprecated-elements/ubuntu-xenial-percona/post-install.d/10-fix-mycnf
index 8ae8a91c..8ae8a91c 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-percona/post-install.d/10-fix-mycnf
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-percona/post-install.d/10-fix-mycnf
diff --git a/integration/scripts/files/elements/ubuntu-xenial-pxc/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-pxc/element-deps
index 7b1a84c9..7b1a84c9 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-pxc/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-pxc/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-pxc/install.d/31-fix-my-cnf b/integration/scripts/files/deprecated-elements/ubuntu-xenial-pxc/install.d/31-fix-my-cnf
index d3347228..d3347228 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-pxc/install.d/31-fix-my-cnf
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-pxc/install.d/31-fix-my-cnf
diff --git a/integration/scripts/files/elements/ubuntu-xenial-redis/element-deps b/integration/scripts/files/deprecated-elements/ubuntu-xenial-redis/element-deps
index 030d85ba..030d85ba 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-redis/element-deps
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-redis/element-deps
diff --git a/integration/scripts/files/elements/ubuntu-xenial-redis/install.d/31-fix-init-file b/integration/scripts/files/deprecated-elements/ubuntu-xenial-redis/install.d/31-fix-init-file
index 08442f60..08442f60 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-redis/install.d/31-fix-init-file
+++ b/integration/scripts/files/deprecated-elements/ubuntu-xenial-redis/install.d/31-fix-init-file
diff --git a/integration/scripts/files/elements/ubuntu-mysql/README.md b/integration/scripts/files/elements/ubuntu-mysql/README.md
deleted file mode 100644
index 39a6ab8c..00000000
--- a/integration/scripts/files/elements/ubuntu-mysql/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Sets up a MySQL server install in the image.
-
-TODO: auto-tune settings based on host resources or metadata service.
diff --git a/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/20-etc b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/20-etc
index 1a350153..c36eb31b 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/20-etc
+++ b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/20-etc
@@ -6,5 +6,3 @@
 dd if=/tmp/in_target.d/trove-guest.service of=/etc/systemd/system/trove-guest.service
 
 systemctl enable trove-guest.service
-
-
diff --git a/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates
index ab9469ed..b55a0ea2 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates
+++ b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates
@@ -6,6 +6,7 @@
 GUEST_UNIT_DROPINS="/etc/systemd/system/trove-guest.service.d"
 
 mkdir -v -p ${GUEST_UNIT_DROPINS}
-echo -e '[Service]\nEnvironment=REQUESTS_CA_BUNDLE=/etc/ssl/certs' > ${GUEST_UNIT_DROPINS}/30-use-system-certificates.conf
-
-
+cat <<EOF > ${GUEST_UNIT_DROPINS}/30-use-system-certificates.conf
+[Service]
+Environment=REQUESTS_CA_BUNDLE=/etc/ssl/certs
+EOF
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mariadb/element-deps b/integration/scripts/files/elements/ubuntu-xenial-mariadb/element-deps
index 5d7756f9..b215f584 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-mariadb/element-deps
+++ b/integration/scripts/files/elements/ubuntu-xenial-mariadb/element-deps
@@ -1 +1 @@
-ubuntu-mariadb
+ubuntu-mariadb
\ No newline at end of file
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb b/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb
index 50eb9256..6d12202c 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb
+++ b/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb
@@ -14,17 +14,17 @@ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74C
 curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup |
   bash -s -- --mariadb-server-version="mariadb-10.4" --skip-key-import --skip-maxscale
 
+apt-get install -y -qq apt-transport-https ca-certificates gnupg2
+
 # NOTE(lxkong): Refer to https://www.percona.com/doc/percona-xtrabackup/2.4/installation/apt_repo.html
 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
 dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
 
-apt-get install -y -qq apt-transport-https ca-certificates
-apt-get update -qq
-
 # Disable password prompt
 debconf-set-selections <<< "mariadb-server mysql-server/root_password password ''"
 debconf-set-selections <<< "mariadb-server mysql-server/root_password_again password ''"
 
+apt-get update -qq
 apt-get install -y -qq --allow-unauthenticated mariadb-server mariadb-client galera-4 libmariadb3 mariadb-backup mariadb-common
 
 cat <<EOF >/etc/mysql/conf.d/no_perf_schema.cnf
@@ -34,5 +34,6 @@ EOF
 
 chown mysql:mysql /etc/mysql/my.cnf
 rm -f /etc/init.d/mysql
+
 systemctl daemon-reload
 systemctl enable mariadb
\ No newline at end of file
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mysql/install.d/30-mysql b/integration/scripts/files/elements/ubuntu-xenial-mysql/install.d/30-mysql
index 9730decb..e9f2d8c6 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mysql/install.d/30-mysql
+++ b/integration/scripts/files/elements/ubuntu-xenial-mysql/install.d/30-mysql
@@ -8,44 +8,15 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get --allow-unauthenticated -y install mysql-client mysql-server
-
-# Xenial provides mysql 5.7 which requires percona-xtrabackup-24
-PXB_VERSION_OVERRIDE=24
-#PKGS=$(apt-cache search percona-xtrabackup-${PXB_VERSION_OVERRIDE})
-#if [[ "$PKGS" == *"percona-xtrabackup-$PXB_VERSION_OVERRIDE"* ]]; then
-#    apt-get --allow-unauthenticated -y install percona-xtrabackup-${PXB_VERSION_OVERRIDE}
-#else
-#    # Architecture is not supported by percona website.  Compile and install it
-#    PXB_VERSION=${PXB_VERSION_OVERRIDE:0:1}.${PXB_VERSION_OVERRIDE:1:1}
-#
-#    apt-get --allow-unauthenticated -y install build-essential flex bison automake autoconf \
-#       libtool cmake libaio-dev mysql-client libncurses-dev zlib1g-dev \
-#       libgcrypt11-dev libev-dev libcurl4-gnutls-dev vim-common
-#
-#    pushd /tmp
-#
-#    git clone https://github.com/percona/percona-xtrabackup.git
-#    cd percona-xtrabackup
-#    git checkout $PXB_VERSION
-#
-#    mkdir /tmp/boost
-#    cmake -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp/boost -DBUILD_CONFIG=xtrabackup_release -DWITH_MAN_PAGES=OFF && make -j4
-#    make install
-#    ln -s /usr/local/xtrabackup/bin/* /usr/bin/
-#
-#    dpkg -P build-essential automake autoconf libtool cmake
-#    apt-get -y clean
-#
-#    popd
-#
-#    rm -rf /tmp/boost /tmp/percona-xtrabackup
-#fi
+apt-get --allow-unauthenticated -y install mysql-client mysql-server gnupg2
 
 # NOTE(lxkong): Refer to https://www.percona.com/doc/percona-xtrabackup/2.4/installation/apt_repo.html
 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
 dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
 apt-get update
+
+# Xenial provides mysql 5.7 which requires percona-xtrabackup-24
+PXB_VERSION_OVERRIDE=24
 apt-get --allow-unauthenticated -y install percona-xtrabackup-${PXB_VERSION_OVERRIDE}
 
 cat >/etc/mysql/conf.d/no_perf_schema.cnf <<_EOF_
@@ -58,7 +29,6 @@ mv /etc/mysql/my.cnf.fallback /etc/mysql/my.cnf
 chown mysql:mysql /etc/mysql/my.cnf
 cat >/etc/mysql/my.cnf <<_EOF_
 [mysql]
-
 !includedir /etc/mysql/conf.d/
 _EOF_
 
diff --git a/integration/scripts/files/elements/ubuntu-xenial-postgresql/element-deps b/integration/scripts/files/elements/ubuntu-xenial-postgresql/element-deps
index 98e1bc19..6a0e1b09 100644
--- a/integration/scripts/files/elements/ubuntu-xenial-postgresql/element-deps
+++ b/integration/scripts/files/elements/ubuntu-xenial-postgresql/element-deps
@@ -1 +1 @@
-ubuntu-postgresql
+ubuntu-postgresql
\ No newline at end of file
diff --git a/integration/scripts/files/trove-guest.systemd.conf b/integration/scripts/files/trove-guest.systemd.conf
index ac4182ec..9d1ed6f6 100644
--- a/integration/scripts/files/trove-guest.systemd.conf
+++ b/integration/scripts/files/trove-guest.systemd.conf
@@ -1,7 +1,9 @@
 [Unit]
 Description=Trove Guest
-After=syslog.target
-After=network.target
+After=syslog.target network.target
+
+[Install]
+WantedBy=multi-user.target
 
 [Service]
 Type=simple
@@ -13,25 +15,23 @@ Group=GUEST_USERNAME
 # CONTROLLER=192.168.32.151
 EnvironmentFile=/etc/trove/controller.conf
 
-ExecStartPre=/bin/bash -c "sudo mkdir -p GUEST_LOGDIR ; sudo chown GUEST_USERNAME:root GUEST_LOGDIR"
+ExecStartPre=/bin/bash -c "sudo mkdir -p GUEST_LOGDIR"
 
 # If ~/trove-installed does not exist, copy the trove source from
 # the user's development environment, then touch the sentinel file
-ExecStartPre=/bin/bash -c "test -e /home/GUEST_USERNAME/trove-installed || sudo -u GUEST_USERNAME rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' -avz --exclude='.*' HOST_SCP_USERNAME@$CONTROLLER:PATH_TROVE/ /home/GUEST_USERNAME/trove && touch /home/GUEST_USERNAME/trove-installed"
+ExecStartPre=/bin/bash -c "test -e /home/GUEST_USERNAME/trove-installed || sudo rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /home/GUEST_USERNAME/.ssh/id_rsa' -avz --exclude='.*' HOST_SCP_USERNAME@$CONTROLLER:PATH_TROVE/ /home/GUEST_USERNAME/trove && touch /home/GUEST_USERNAME/trove-installed"
 
 # If /etc/trove does not exist, create it and then copy the trove-guestagent.conf
 # from /etc/trove on the user's development environment,
-ExecStartPre=/bin/bash -c "test -d /etc/trove/conf.d || sudo mkdir -p /etc/trove/conf.d && sudo -u GUEST_USERNAME rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' -avz --exclude='.*' HOST_SCP_USERNAME@$CONTROLLER:/etc/trove/trove-guestagent.conf ~GUEST_USERNAME/ && sudo mv ~GUEST_USERNAME/trove-guestagent.conf /etc/trove/conf.d/trove-guestagent.conf"
+ExecStartPre=/bin/bash -c "test -d /etc/trove/conf.d || sudo mkdir -p /etc/trove/conf.d && sudo rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /home/GUEST_USERNAME/.ssh/id_rsa' -avz --exclude='.*' HOST_SCP_USERNAME@$CONTROLLER:/etc/trove/trove-guestagent.conf ~GUEST_USERNAME/ && sudo mv ~GUEST_USERNAME/trove-guestagent.conf /etc/trove/conf.d/trove-guestagent.conf"
 
-ExecStartPre=/bin/bash -c "sudo chown -R GUEST_USERNAME:root /etc/trove"
+ExecStartPre=/bin/bash -c "sudo chown -R GUEST_USERNAME:root /etc/trove /home/GUEST_USERNAME/trove GUEST_LOGDIR"
 
-ExecStart=/home/GUEST_USERNAME/trove/contrib/trove-guestagent --config-dir=/etc/trove/conf.d
+# Start trove-guest.service
+ExecStart=/bin/bash -c "/home/GUEST_USERNAME/trove/contrib/trove-guestagent --config-dir=/etc/trove/conf.d"
 
-# Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300
+Restart=on-failure
 
-# PgSql doesn't play nice with PrivateTmp
-PrivateTmp=false
-
-[Install]
-WantedBy=multi-user.target
+# PostgreSQL doesn't play nice with PrivateTmp
+PrivateTmp=false
\ No newline at end of file
diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu
index 39dcd958..f43078d9 100644
--- a/integration/scripts/functions_qemu
+++ b/integration/scripts/functions_qemu
@@ -66,7 +66,9 @@ function build_vm() {
         elementes="$elementes pip-cache"
         elementes="$elementes guest-agent"
     else
+        # Install guest agent dependencies, user, etc.
         elementes="$elementes ${guest_os}-guest"
+        # Install guest agent service
         elementes="$elementes ${guest_os}-${guest_release}-guest"
     fi
 
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 4aa66a53..24ab6c70 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -514,10 +514,6 @@ function get_field() {
     done
 }
 
-function get_glance_id () {
-    echo `$@ | grep ' id ' | get_field 2`
-}
-
 function set_bin_path() {
     if is_fedora; then
        sed -i "s|%bin_path%|/usr/bin|g" $TEST_CONF
@@ -526,35 +522,16 @@ function set_bin_path() {
     fi
 }
 
-function set_mysql_pkg() {
-    if is_fedora; then
-       MYSQL_PKG="mysql-community-server"
-       MYSQL_VER="5.6"
-    else
-       if [[ "$RELEASE" == "xenial" || "$RELEASE" == "bionic" ]]; then
-           MYSQL_PKG="mysql-server-5.7"
-           MYSQL_VER="5.7"
-       else
-           MYSQL_PKG="mysql-server-5.6"
-           MYSQL_VER="5.6"
-       fi
-    fi
-}
-
-
 function cmd_set_datastore() {
     local IMAGEID=$1
     local DATASTORE_TYPE=$2
-    local RESTART_TROVE=${3:-$(get_bool RESTART_TROVE "true")}
 
     # rd_manage datastore_update <datastore_name> <default_version>
     rd_manage datastore_update "$DATASTORE_TYPE" ""
     PACKAGES=${PACKAGES:-""}
 
     if [ "$DATASTORE_TYPE" == "mysql" ]; then
-        set_mysql_pkg
-        PACKAGES=${PACKAGES:-$MYSQL_PKG}
-        VERSION=$MYSQL_VER
+        VERSION="5.7"
     elif [ "$DATASTORE_TYPE" == "percona" ]; then
         PACKAGES=${PACKAGES:-"percona-server-server-5.6"}
         VERSION="5.6"
@@ -562,7 +539,6 @@ function cmd_set_datastore() {
         PACKAGES=${PACKAGES:-"percona-xtradb-cluster-server-5.6"}
         VERSION="5.6"
     elif [ "$DATASTORE_TYPE" == "mariadb" ]; then
-        PACKAGES=${PACKAGES:-"mariadb-server"}
         VERSION="10.4"
     elif [ "$DATASTORE_TYPE" == "mongodb" ]; then
         PACKAGES=${PACKAGES:-"mongodb-org"}
@@ -577,7 +553,6 @@ function cmd_set_datastore() {
         PACKAGES=${PACKAGES:-"couchbase-server"}
         VERSION="2.2.0"
     elif [ "$DATASTORE_TYPE" == "postgresql" ]; then
-        PACKAGES=${PACKAGES:-"postgresql-9.6"}
         VERSION="9.6"
     elif [ "$DATASTORE_TYPE" == "couchdb" ]; then
         PACKAGES=${PACKAGES:-"couchdb"}
@@ -593,28 +568,14 @@ function cmd_set_datastore() {
         exit 1
     fi
 
-    sed -i "s/%datastore_type%/$DATASTORE_TYPE/g" $TEST_CONF
-    sed -i "s/%datastore_version%/$VERSION/g" $TEST_CONF
-
-    #rd_manage datastore_version_update <datastore_name> <version_name> <datastore_manager> <image_id> <packages> <active>
+    # trove-manage datastore_version_update <datastore_name> <version_name> <datastore_manager> <image_id> <packages> <active>
     rd_manage datastore_version_update "$DATASTORE_TYPE" "$VERSION" "$DATASTORE_TYPE" $IMAGEID "$PACKAGES" 1
-    rd_manage datastore_version_update "$DATASTORE_TYPE" "inactive_version" "manager1" $IMAGEID "" 0
     rd_manage datastore_update "$DATASTORE_TYPE" "$VERSION"
-    rd_manage datastore_update Test_Datastore_1 ""
 
     if [ -f "$PATH_TROVE"/trove/templates/$DATASTORE_TYPE/validation-rules.json ]; then
         # add the configuration parameters to the database for the kick-start datastore
         rd_manage db_load_datastore_config_parameters "$DATASTORE_TYPE" "$VERSION" "$PATH_TROVE"/trove/templates/$DATASTORE_TYPE/validation-rules.json
     fi
-
-    if [[ "${RESTART_TROVE}" == true ]]; then
-        cmd_stop
-    fi
-    iniset $TROVE_CONF DEFAULT default_datastore "$DATASTORE_TYPE"
-    sleep 1.5
-    if [[ "${RESTART_TROVE}" == true ]]; then
-        cmd_start
-    fi
 }
 
 ###############################################################################
@@ -681,7 +642,8 @@ function install_test_packages() {
 }
 
 function mod_confs() {
-    DATASTORE_TYPE=$1
+    local DATASTORE_TYPE=$1
+    local DATASTORE_VERSION=$2
     exclaim "Running mod_confs ..."
 
     sudo install -b --mode 0664 $TROVESTACK_SCRIPTS/conf/test_begin.conf $TEST_CONF
@@ -701,20 +663,9 @@ function mod_confs() {
     cat $DATASTORE_CONF | sudo tee -a $TEST_CONF > /dev/null
     cat $TROVESTACK_SCRIPTS/conf/test_end.conf | sudo tee -a $TEST_CONF > /dev/null
 
-    #When running in the gate, don't start services
-    if [ "${DEVSTACK_GATE_TROVE}" == "1" ]; then
-        sed -i "s,%startservices%,false,g" ${TEST_CONF}
-    else
-        sed -i "s,%startservices%,true,g" ${TEST_CONF}
-    fi
     #Add the paths to the test conf
     sed -i "s,%report_directory%,$TROVE_REPORT_DIR,g" $TEST_CONF
-    sed -i "s,%keystone_path%,$PATH_KEYSTONE,g" $TEST_CONF
-    sed -i "s,%nova_path%,$PATH_NOVA,g" $TEST_CONF
-    sed -i "s,%glance_path%,$PATH_GLANCE,g" $TEST_CONF
-    sed -i "s,%trove_path%,$PATH_TROVE,g" $TEST_CONF
     sed -i "s,%service_host%,$SERVICE_HOST,g" $TEST_CONF
-    sed -i "s,%swifth_path%,$PATH_SWIFT,g" $TEST_CONF
 
     # Add the region name into test.conf
     sed -i "s/%region_name%/${REGION_NAME}/g" $TEST_CONF
@@ -759,8 +710,10 @@ function mod_confs() {
         iniset $TROVE_CONF $DATASTORE_TYPE num_config_servers_per_cluster 1
     fi
 
-    set_bin_path
+    sed -i "s/%datastore_type%/$DATASTORE_TYPE/g" $TEST_CONF
+    sed -i "s/%datastore_version%/${DATASTORE_VERSION}/g" $TEST_CONF
 
+    set_bin_path
 }
 
 function setup_cluster_configs() {
@@ -794,6 +747,7 @@ function add_test_flavors() {
 
 function cmd_test_init() {
     local DATASTORE_TYPE=$1
+    local DATASTORE_VERSION=$2
 
     if [ -z "${DATASTORE_TYPE}" ]; then
         exclaim "${COLOR_RED}Datastore argument was not specified.${COLOR_NONE}"
@@ -806,7 +760,7 @@ function cmd_test_init() {
     install_test_packages "${DATASTORE_TYPE}"
 
     exclaim "Modifying test.conf and guest.conf with appropriate values."
-    mod_confs "${DATASTORE_TYPE}"
+    mod_confs "${DATASTORE_TYPE}" "${DATASTORE_VERSION}"
 
     exclaim "Creating Test Flavors."
     add_test_flavors
@@ -823,7 +777,7 @@ function cmd_build_image() {
     local output=$6
 
     if [[ -z "$output" ]]; then
-        image_name="trove-${IMAGE_GUEST_OS}-${IMAGE_GUEST_RELEASE}-${IMAGE_DATASTORE_TYPE}"
+        image_name="trove-datastore-${IMAGE_GUEST_OS}-${IMAGE_GUEST_RELEASE}-${IMAGE_DATASTORE_TYPE}"
         image_folder=$HOME/images
         output="${image_folder}/${image_name}"
     fi
@@ -840,13 +794,17 @@ function cmd_build_image() {
     build_guest_image $IMAGE_DATASTORE_TYPE $IMAGE_GUEST_OS $IMAGE_GUEST_RELEASE $DEV_MODE ${guest_username} $output
 }
 
+# Build guest image and upload to Glance, register the datastore and configuration parameters.
+# We could skip the image build and upload by:
+#   1. MYSQL_IMAGE_ID is passed, or
+#   2. There is an image in Glance contains the datastore name
 function cmd_build_and_upload_image() {
     local datastore_type=$1
-    local restart_trove=${2:-$(get_bool RESTART_TROVE "true")}
-    local guest_os=${3:-"ubuntu"}
-    local guest_release=${4:-"xenial"}
-    local dev_mode=${5:-"true"}
-    local guest_username=${6:-"ubuntu"}
+    local guest_os=${2:-"ubuntu"}
+    local guest_release=${3:-"xenial"}
+    local dev_mode=${4:-"true"}
+    local guest_username=${5:-"ubuntu"}
+    local output_dir=${6:-"$HOME/images"}
 
     if [ -z "${datastore_type}" ]; then
         exclaim "${COLOR_RED}Datastore argument was not specified.${COLOR_NONE}"
@@ -861,21 +819,20 @@ function cmd_build_and_upload_image() {
       glance_imageid=$(openstack $CLOUD_ADMIN_ARG image list | grep "$datastore_type" | awk 'NR==1 {print}' | awk '{print $2}')
 
       if [[ -z $glance_imageid ]]; then
-          cmd_build_image ${datastore_type} ${guest_os} ${guest_release} ${dev_mode} ${guest_username}
+          mkdir -p ${output_dir}
+          name=trove-datastore-${guest_os}-${guest_release}-${datastore_type}
+          output=${output_dir}/$name.qcow2
+          cmd_build_image ${datastore_type} ${guest_os} ${guest_release} ${dev_mode} ${guest_username} $output
 
-          image_folder=$HOME/images
-          qcow_image=`find $image_folder -name '*.qcow2'`
-          image_url="file://$qcow_image"
-          glance_imageid=`get_glance_id upload_image $image_url`
+          glance_imageid=$(openstack ${CLOUD_ADMIN_ARG} image create $name --public --disk-format qcow2 --container-format bare --file $output --property hw_rng_model='virtio' -c id -f value)
           [[ -z "$glance_imageid" ]] && echo "Glance upload failed!" && exit 1
-          echo "IMAGE ID: $glance_imageid"
       fi
     fi
 
-    echo "IMAGEID: $glance_imageid"
+    exclaim "Using Glance image ID: $glance_imageid"
 
     exclaim "Updating Datastores"
-    cmd_set_datastore "${glance_imageid}" "${datastore_type}" "${restart_trove}"
+    cmd_set_datastore "${glance_imageid}" "${datastore_type}"
 }
 
 
@@ -1037,7 +994,7 @@ function cmd_int_tests() {
     fi
     cd $TROVESTACK_SCRIPTS
     if [ $# -lt 1 ]; then
-        args="--group=blackbox"
+        args="--group=mysql"
     else
         args="$@"
     fi
@@ -1055,23 +1012,6 @@ function cmd_int_tests() {
     python $args
 }
 
-function cmd_int_tests_simple() {
-    exclaim "Running Trove Simple Integration Tests..."
-    cd $TROVESTACK_SCRIPTS
-    if [ $# -lt 1 ]; then
-        args="--group=simple_blackbox"
-    else
-        args="$@"
-    fi
-
-    # -- verbose makes it prettier.
-    # -- logging-clear-handlers keeps the novaclient and other things from
-    #    spewing logs to stdout.
-    args="$INT_TEST_OPTIONS -B $TROVESTACK_TESTS/integration/int_tests.py --verbose --logging-clear-handlers $args"
-    echo "python $args"
-    python $args
-}
-
 function cmd_int_tests_white_box() {
     export PYTHONPATH=$PYTHONPATH:$PATH_TROVE
     export PYTHONPATH=$PYTHONPATH:$PATH_NOVA
@@ -1259,49 +1199,45 @@ function cmd_clean() {
 
 function cmd_kick_start() {
     local DATASTORE_TYPE=$1
-    local RESTART_TROVE=${2:-$(get_bool RESTART_TROVE "true")}
+    local DATASTORE_VERSION=$2
 
     if [ -z "${DATASTORE_TYPE}" ]; then
         exclaim "${COLOR_RED}Datastore argument was not specified.${COLOR_NONE}"
         exit 1
     fi
 
-    exclaim "Running kick-start for $DATASTORE_TYPE (restart trove: $RESTART_TROVE)"
+    exclaim "Running kick-start for $DATASTORE_TYPE"
     dump_env
-    cmd_test_init "${DATASTORE_TYPE}"
-
-    export GUEST_OS=${GUEST_OS:-"ubuntu"}
-    export GUEST_OS_RELEASE=${GUEST_OS_RELEASE:-"xenial"}
-    export GUEST_OS_USERNAME=${GUEST_OS_USERNAME:-"ubuntu"}
-    export DEV_MOEE=${DEV_MODE:-"true"}
-    cmd_build_and_upload_image "${DATASTORE_TYPE}" "${RESTART_TROVE}" "${GUEST_OS}" "${GUEST_OS_RELEASE}" "${DEV_MOEE}" "${GUEST_OS_USERNAME}"
+    cmd_test_init "${DATASTORE_TYPE}" "${DATASTORE_VERSION}"
 }
 
+# Start functional test. The guest image should be created and registered in
+# appropriate datastore before the test, the configuration parameters should
+# also be loaded as well. DevStack has done all of that.
 function cmd_gate_tests() {
     local DATASTORE_TYPE=${1:-'mysql'}
     local TEST_GROUP=${2:-${DATASTORE_TYPE}}
-    local HOST_SCP_USERNAME=${3:-$(whoami)}
-    local GUEST_USERNAME=${4:-'ubuntu'}
-    # We're not using devstack-gate in Zuul v3 job
-    if [[ $GATE_JOB_VER == "v2" ]]; then
-        local ESCAPED_PATH_TROVE=${5:-'\/opt\/stack\/new\/trove'}
-    fi
+    local DATASTORE_VERSION=${3:-'5.7'}
+    local HOST_SCP_USERNAME=${4:-$(whoami)}
+    local GUEST_USERNAME=${5:-'ubuntu'}
 
     exclaim "Running cmd_gate_tests ..."
 
     export REPORT_DIRECTORY=${REPORT_DIRECTORY:=$HOME/gate-tests-report/}
     export TROVE_REPORT_DIR=$HOME/gate-tests-report/
-    TROVESTACK_DUMP_ENV=true
-
+    export TROVESTACK_DUMP_ENV=true
     export SSH_DIR=${SSH_DIR:-"$HOME/.ssh"}
-    # The user used to connect the db instance.
+    # The user is used to connect with the db instance during testing.
     export TROVE_TEST_SSH_USER=${TROVE_TEST_SSH_USER:-"ubuntu"}
-    # This var is used to ssh into the db instance during the test.
+    # This var is used to ssh into the db instance during testing.
     export TROVE_TEST_SSH_KEY_FILE=${SSH_DIR}/id_rsa
 
     cd $TROVESTACK_SCRIPTS
-    local RESTART_TROVE=false
-    cmd_kick_start "${DATASTORE_TYPE}" "${RESTART_TROVE}"
+
+    # Build and upload guest image, register datastore version.
+    cmd_build_and_upload_image ${DATASTORE_TYPE}
+
+    cmd_kick_start "${DATASTORE_TYPE}" "${DATASTORE_VERSION}"
 
     cmd_int_tests --group=$TEST_GROUP
 }
@@ -1441,42 +1377,13 @@ function run_command() {
     fi
 
     case "$1" in
-        "install" ) cmd_install;;
-        "test-init" ) shift; cmd_test_init $@;;
         "build-image" ) shift; cmd_build_image $@;;
-        "initialize" ) cmd_initialize;;
-        "unit-tests" ) cmd_unit_tests;;
-        "start-deps" ) cmd_start_deps;;
-        "stop-deps" ) cmd_stop_deps;;
-        "start" ) cmd_start;;
+        "upload-image" ) shift; cmd_build_and_upload_image $@;;
         "int-tests" ) shift; cmd_int_tests $@;;
-        "int-tests-wb" ) shift; cmd_int_tests_white_box $@;;
-        "simple-tests") shift; cmd_int_tests_simple $@;;
-        "stop" ) cmd_stop;;
-        "restart" ) cmd_stop; cmd_start;;
-        "wipe-logs" ) cmd_wipe_logs;;
-        "rd-sql" ) shift; cmd_rd_sql $@;;
-        "fake-sql" ) shift; cmd_fake_sql $@;;
-        "run-ci" ) shift; cmd_run_ci $@;;
-        "vagrant-ssh" ) shift; cmd_vagrant_ssh $@;;
         "debug" ) shift; echo "Enabling debugging."; \
                   set -o xtrace; TROVESTACK_DUMP_ENV=true; run_command $@;;
-        "clear" ) shift; cmd_clear $@;;
-        "clean" ) shift; cmd_clean $@;;
-        "run" ) shift; cmd_run $@;;
-        "kick-start" ) shift; cmd_kick_start $@;;
-        "dsvm-gate-tests" ) shift; export GATE_JOB_VER=v2; \
-                            cmd_gate_tests $@;;
         "gate-tests" ) shift; cmd_gate_tests $@;;
-        "run-fake" ) shift; cmd_run_fake $@;;
-        "start-fake" ) shift; cmd_start_fake $@;;
-        "update-projects" ) cmd_clone_projects force_update \
-                            $TROVESTACK_SCRIPTS/projects-list \
-                            $TROVESTACK_SCRIPTS/image-projects-list;;
-        "reset-task" ) shift; cmd_reset_task $@;;
         "wipe-queues" ) shift; cmd_wipe_queues $@;;
-        "repl" ) shift; cmd_repl $@;;
-        "help" ) print_usage;;
         * )
             echo "'$1' not a valid command"
             exit 1