diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-01 11:31:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-01 11:31:14 +0000 |
| commit | 8ba162cd11c8a75505b926759aff1a0a8694260a (patch) | |
| tree | ae4dea35bf523a177ae695d1f86c4ce6d1f318b4 /nova/cells | |
| parent | d376043bef1477a9aaab5037e8a38429cf5a6926 (diff) | |
| parent | ea6d089d196e2d71eac17a1b0079788a71522cfd (diff) | |
| download | nova-8ba162cd11c8a75505b926759aff1a0a8694260a.tar.gz nova-8ba162cd11c8a75505b926759aff1a0a8694260a.tar.xz nova-8ba162cd11c8a75505b926759aff1a0a8694260a.zip | |
Merge "Update instance properties values in child cells to create instance."
Diffstat (limited to 'nova/cells')
| -rw-r--r-- | nova/cells/scheduler.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/cells/scheduler.py b/nova/cells/scheduler.py index 08f485189..c2b3ff2b7 100644 --- a/nova/cells/scheduler.py +++ b/nova/cells/scheduler.py @@ -24,6 +24,7 @@ from oslo.config import cfg from nova.cells import filters from nova.cells import weights from nova import compute +from nova.compute import flavors from nova.compute import instance_actions from nova.compute import utils as compute_utils from nova.compute import vm_states @@ -80,6 +81,10 @@ class CellsScheduler(base.Base): def _create_instances_here(self, ctxt, instance_uuids, instance_properties, instance_type, image, security_groups, block_device_mapping): instance_values = copy.copy(instance_properties) + sys_metadata = flavors.save_flavor_info(dict(), instance_type) + instance_values['system_metadata'] = sys_metadata + instance_values.pop('name') + num_instances = len(instance_uuids) for i, instance_uuid in enumerate(instance_uuids): instance_values['uuid'] = instance_uuid |