diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-03-30 12:34:10 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-03-30 12:34:10 -0700 |
| commit | 1703592992ebdd5bbf19952f79f05022a4cdc849 (patch) | |
| tree | 54ca1082b409edb4c3d7a40f922e377355c03454 /nova/image | |
| parent | 323eb60884cf8736448d997068d32f252d22e7f3 (diff) | |
remove all references to image_type and change nova-manage upload to set container format more intelligently
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/fake.py | 6 | ||||
| -rw-r--r-- | nova/image/s3.py | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nova/image/fake.py b/nova/image/fake.py index 08302d6eb..d1c62757f 100644 --- a/nova/image/fake.py +++ b/nova/image/fake.py @@ -44,10 +44,10 @@ class FakeImageService(service.BaseImageService): 'created_at': timestamp, 'updated_at': timestamp, 'status': 'active', - 'type': 'machine', + 'container_format': 'ami', + 'disk_format': 'raw', 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel, - 'disk_format': 'ami'} + 'ramdisk_id': FLAGS.null_kernel} } self.create(None, image) super(FakeImageService, self).__init__() diff --git a/nova/image/s3.py b/nova/image/s3.py index ddec5f3aa..203bedc49 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -177,7 +177,6 @@ class S3ImageService(service.BaseImageService): properties['ramdisk_id'] = ec2utils.ec2_id_to_id(ramdisk_id) properties['is_public'] = False - properties['type'] = image_type metadata.update({'disk_format': image_format, 'container_format': image_format, 'status': 'queued', |