diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-12-16 13:40:38 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-12-16 16:28:23 -0800 |
| commit | a135c8ecd16bb6a97743e4be1b060daff874879e (patch) | |
| tree | d6a95ed79b896113637c2bae5e993a657b70e1ce /nova/compute | |
| parent | 106ea5eda8458b44846207a3df69cf1837789828 (diff) | |
Properly passes arg to run_iscsiadm to fix logout
* fixes 905471
* includes test to verify expected calls
* elevates context as expected for volume_api.detach
Change-Id: I0c2a5822d45df6f82f103f49ce8fcfe4a38a0049
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d6912bb56..8b444b958 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1484,7 +1484,7 @@ class ComputeManager(manager.SchedulerDependentManager): bdm = self._get_instance_volume_bdm(context, instance_id, volume_id) self._detach_volume(context, instance_ref['name'], bdm) self.volume_api.terminate_connection(context, volume_id, FLAGS.my_ip) - self.volume_api.detach(context, volume_id) + self.volume_api.detach(context.elevated(), volume_id) self.db.block_device_mapping_destroy_by_instance_and_volume( context, instance_id, volume_id) return True |