diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-13 16:50:07 -0500 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-13 16:50:07 -0500 |
| commit | 01c14510b3b2eaa3f05ceb403c9b07872b52eaec (patch) | |
| tree | e8b0be65f5912bea24db0becf931c2ee61108d5c /nova/api | |
| parent | a5026320b4ae14f0171ee450fe79ea687ab5647a (diff) | |
| parent | 621cf8e156582b3ff4dd44409324cc3a5f9aecf4 (diff) | |
| download | nova-01c14510b3b2eaa3f05ceb403c9b07872b52eaec.tar.gz nova-01c14510b3b2eaa3f05ceb403c9b07872b52eaec.tar.xz nova-01c14510b3b2eaa3f05ceb403c9b07872b52eaec.zip | |
Merged with 557
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 7ac9bef96..c7ee8eae8 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -593,7 +593,7 @@ class CloudController(object): # TODO(vish): Instance should be None at db layer instead of # trying to lazy load, but for now we turn it into # a dict to avoid an error. - return {'volumeSet': [self._format_volume(context, dict(volume_ref))]} + return {'volumeSet': [self._format_volume(context, dict(volume))]} def delete_volume(self, context, volume_id, **kwargs): self.volume_api.delete(context, volume_id) |