Merge "Remove 'status' from default snapshot properties"

1 files changed, 6 insertions, 5 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 3630a3ec2..0ed562a1b 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1199,14 +1199,12 @@ class API(base.Base):
             'image_type': image_type,
         }
 
+        sent_meta = {'name': name, 'is_public': False}
+
         if image_type == 'backup':
             properties['backup_type'] = backup_type
 
-        properties.update(extra_properties or {})
-        sent_meta = {'name': name, 'is_public': False,
-                     'status': 'creating', 'properties': properties}
-
-        if image_type == 'snapshot':
+        elif image_type == 'snapshot':
             min_ram, min_disk = self._get_minram_mindisk_params(context,
                                                                 instance)
             if min_ram is not None:
@@ -1214,6 +1212,9 @@ class API(base.Base):
             if min_disk is not None:
                 sent_meta['min_disk'] = min_disk
 
+        properties.update(extra_properties or {})
+        sent_meta['properties'] = properties
+
         recv_meta = self.image_service.create(context, sent_meta)
         params = {'image_id': recv_meta['id'], 'image_type': image_type,
                   'backup_type': backup_type, 'rotation': rotation}