diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-02 10:01:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-02 10:01:50 +0000 |
| commit | d6ab085cf51f852874e1ad63a9e28733208a6714 (patch) | |
| tree | c3b088161cd08b1e6f3918a7071c74d70bd34003 /trove/taskmanager/manager.py | |
| parent | 957f72bf311d5c76c5e2f5fffdee4aebd12c56a5 (diff) | |
| parent | e5c757f3ee9e2642f26139f3a344f9dcc1ab6fb9 (diff) | |
| download | trove-d6ab085cf51f852874e1ad63a9e28733208a6714.tar.gz | |
Merge "Use unique passwords for replication user"2014.2.rc1
Diffstat (limited to 'trove/taskmanager/manager.py')
| -rw-r--r-- | trove/taskmanager/manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/trove/taskmanager/manager.py b/trove/taskmanager/manager.py index 1ea7b1e9..5c119c9b 100644 --- a/trove/taskmanager/manager.py +++ b/trove/taskmanager/manager.py @@ -60,8 +60,10 @@ class Manager(periodic_task.PeriodicTasks): instance_tasks.restart() def detach_replica(self, context, instance_id): - instance_tasks = models.BuiltInstanceTasks.load(context, instance_id) - instance_tasks.detach_replica() + slave = models.BuiltInstanceTasks.load(context, instance_id) + master_id = slave.slave_of_id + master = models.BuiltInstanceTasks.load(context, master_id) + slave.detach_replica(master) def migrate(self, context, instance_id, host): instance_tasks = models.BuiltInstanceTasks.load(context, instance_id) |