diff options
-rw-r--r-- | nova/cells/scheduler.py | 5 | ||||
-rw-r--r-- | nova/tests/cells/test_cells_scheduler.py | 3 |
2 files changed, 7 insertions, 1 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 diff --git a/nova/tests/cells/test_cells_scheduler.py b/nova/tests/cells/test_cells_scheduler.py index 46be492cc..38076fb0c 100644 --- a/nova/tests/cells/test_cells_scheduler.py +++ b/nova/tests/cells/test_cells_scheduler.py @@ -94,7 +94,8 @@ class CellsSchedulerTestCase(test.TestCase): inst_type = db.instance_type_get(self.ctxt, 1) image = {'properties': {}} instance_uuids = self.instance_uuids - instance_props = {'hostname': 'meow', + instance_props = {'name': 'instance-00000001', + 'hostname': 'meow', 'display_name': 'moo', 'image_ref': 'fake_image_ref', 'user_id': self.ctxt.user_id, |