diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-29 20:03:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-29 20:03:41 +0000 |
| commit | 53813e08de69b155cecdeb2fd5c971b53c08008b (patch) | |
| tree | 26d2ca8f2e4d73342feaa36888584e3a75a788c3 /nova/compute | |
| parent | 2b602148be8ffa9aec377fc2c220464d9c43c885 (diff) | |
| parent | fed19822f89ce7f6542d8ea6a4a8b85cfa6065d6 (diff) | |
Merge "Keep flavor information in system_metadata"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 4961827fd..a9d0a1bdd 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -508,6 +508,13 @@ class API(base.Base): availability_zone, forced_host = self._handle_availability_zone( availability_zone) + system_metadata = {} + instance_type_props = ['id', 'name', 'memory_mb', 'vcpus', + 'root_gb', 'ephemeral_gb', 'flavorid', + 'swap', 'rxtx_factor', 'vcpu_weight'] + for k in instance_type_props: + system_metadata["instance_type_%s" % k] = instance_type[k] + base_options = { 'reservation_id': reservation_id, 'image_ref': image_href, @@ -537,7 +544,8 @@ class API(base.Base): 'access_ip_v6': access_ip_v6, 'availability_zone': availability_zone, 'root_device_name': root_device_name, - 'progress': 0} + 'progress': 0, + 'system_metadata': system_metadata} options_from_image = self._inherit_properties_from_image( image, auto_disk_config) |