Merge lp:~ttx/nova/bexar-lp713430 into lp:nova/bexar

Proposed by Thierry Carrez
Status: Merged
Approved by: Soren Hansen
Approved revision: 646
Merged at revision: 649
Proposed branch: lp:~ttx/nova/bexar-lp713430
Merge into: lp:nova/bexar
Diff against target: 12 lines (+1/-1)
1 file modified
nova/volume/manager.py (+1/-1)
To merge this branch: bzr merge lp:~ttx/nova/bexar-lp713430
Reviewer Review Type Date Requested Status
Soren Hansen (community) Approve
Jay Pipes (community) Approve
OpenStack Infra Pending
Review via email: mp+49991@code.launchpad.net

Commit message

Fixes undefined reference to volume_ref that is used for a log message in init_host in volume/manager.py. The variable was supposed to be just volume.

Description of the change

Backport of the Cactus fix:

Fixes undefined reference to volume_ref that is used for a log message in init_host in volume/manager.py. The variable was supposed to be just volume.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

easy backport fix. lgtm.

review: Approve
Revision history for this message
Soren Hansen (soren) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nova/volume/manager.py'
--- nova/volume/manager.py 2011-01-21 21:10:26 +0000
+++ nova/volume/manager.py 2011-02-16 16:02:41 +0000
@@ -87,7 +87,7 @@
87 if volume['status'] in ['available', 'in-use']:87 if volume['status'] in ['available', 'in-use']:
88 self.driver.ensure_export(ctxt, volume)88 self.driver.ensure_export(ctxt, volume)
89 else:89 else:
90 LOG.info(_("volume %s: skipping export"), volume_ref['name'])90 LOG.info(_("volume %s: skipping export"), volume['name'])
9191
92 def create_volume(self, context, volume_id):92 def create_volume(self, context, volume_id):
93 """Creates and exports the volume."""93 """Creates and exports the volume."""

Subscribers

People subscribed via source and target branches