diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-31 17:10:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-31 17:10:44 +0000 |
| commit | cf38444df801062fd370c29a7d76f1e7bb1be0f4 (patch) | |
| tree | 6a1c9328faaae369e07e61c51f9581d5e449f065 /nova | |
| parent | 8b64167a16a8dffbc36f04958a9162912d25ce15 (diff) | |
| parent | 1591c94bdd5f2b746be362dee5f0dd4068994ea4 (diff) | |
| download | nova-cf38444df801062fd370c29a7d76f1e7bb1be0f4.tar.gz nova-cf38444df801062fd370c29a7d76f1e7bb1be0f4.tar.xz nova-cf38444df801062fd370c29a7d76f1e7bb1be0f4.zip | |
Merge "Fixed boot from snapshot failure."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/volume/cinder.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index ed6b3cd59..590b7d8a0 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -170,8 +170,12 @@ class API(base.Base): def create(self, context, size, name, description, snapshot=None, volume_type=None, metadata=None, availability_zone=None): + if snapshot is not None: + snapshot_id = snapshot['id'] + else: + snapshot_id = None item = cinderclient(context).volumes.create(size, - snapshot, + snapshot_id, name, description, volume_type, |