summaryrefslogtreecommitdiffstats
path: root/nova/volume
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-05-27 11:08:18 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-05-27 11:08:18 +0900
commitd9732fa7cbadd8c3d0ed8dbcf24d920f38129fbc (patch)
tree896206f421a39914cd7f0a03304efcc77d4e2dd2 /nova/volume
parent42272241d24e120398f741e9c8fa7d810b921209 (diff)
downloadnova-d9732fa7cbadd8c3d0ed8dbcf24d920f38129fbc.tar.gz
nova-d9732fa7cbadd8c3d0ed8dbcf24d920f38129fbc.tar.xz
nova-d9732fa7cbadd8c3d0ed8dbcf24d920f38129fbc.zip
volume/api: allow volume clone from snapshot without size
ec2 ebs boot accepts volume-clone from snapshots without size specified. In that case original snapshot size is used. So teach it to volume api create()
Diffstat (limited to 'nova/volume')
-rw-r--r--nova/volume/api.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/volume/api.py b/nova/volume/api.py
index 7fa80383b..b48bcb8da 100644
--- a/nova/volume/api.py
+++ b/nova/volume/api.py
@@ -44,7 +44,8 @@ class API(base.Base):
snapshot = self.get_snapshot(context, snapshot_id)
if snapshot['status'] != "available":
raise exception.ApiError(_("Snapshot status must be available"))
- size = snapshot['volume_size']
+ if not size:
+ size = snapshot['volume_size']
if quota.allowed_volumes(context, 1, size) < 1:
pid = context.project_id