summaryrefslogtreecommitdiff
path: root/trove/guestagent/datastore/mysql_common/service.py
diff options
context:
space:
mode:
authorDariusz Krol <d.krol@samsung.com>2018-10-01 15:57:26 +0200
committerDariusz Krol <d.krol@samsung.com>2018-12-14 21:26:01 +0100
commit68a4819dd4094fa676c323b9a05438c8b8da09ae (patch)
tree9bd5dd43de2708bb8873a08b4a355a11ce5f9053 /trove/guestagent/datastore/mysql_common/service.py
parentc63c5888c230908f7d4d64324c0c30285af4b4bd (diff)
downloadtrove-68a4819dd4094fa676c323b9a05438c8b8da09ae.tar.gz
Add image setup to trove devstack plugin
Main goal is to have a working vm image registered in trove after devstack installation. It is a first step towards trovestack-redesign as described in https://etherpad.openstack.org/p/trovestack-redesign It is enabled by default during devstack installation with trove enabled plugin, but it can be skipped by setting DISABLE_TROVE_IMAGE_SETUP=TRUE Implementation details: * export environmental variables for diskimage-builder * build an image with disk-image-create script * register the newly created image in trove * add tripleo-elements information to default settings Change-Id: I6e57890c5b6fb65e9b8c63363f92e5a7c70e523e Signed-off-by: Dariusz Krol <d.krol@samsung.com>
Diffstat (limited to 'trove/guestagent/datastore/mysql_common/service.py')
-rw-r--r--trove/guestagent/datastore/mysql_common/service.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py
index 28931b03..51976646 100644
--- a/trove/guestagent/datastore/mysql_common/service.py
+++ b/trove/guestagent/datastore/mysql_common/service.py
@@ -934,7 +934,7 @@ class BaseMySqlApp(object):
LOG.info("Starting slave replication.")
with self.local_sql_client(self.get_engine()) as client:
client.execute('START SLAVE')
- self._wait_for_slave_status("ON", client, 60)
+ self._wait_for_slave_status("ON", client, 180)
def stop_slave(self, for_failover):
replication_user = None
@@ -944,7 +944,7 @@ class BaseMySqlApp(object):
replication_user = result.first()['Master_User']
client.execute('STOP SLAVE')
client.execute('RESET SLAVE ALL')
- self._wait_for_slave_status("OFF", client, 30)
+ self._wait_for_slave_status("OFF", client, 180)
if not for_failover:
client.execute('DROP USER ' + replication_user)
return {