diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-05-28 18:45:33 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-06-07 11:43:37 -0700 |
| commit | eefc3c1892c523100470414d00a981ea9fbdf3ca (patch) | |
| tree | 59c26e57b40f23e44a5a51bae2a7a50aeccffe48 /nova/compute | |
| parent | e95807e8cda4463d7c9a2aab918bd2bda3d3cf9e (diff) | |
| download | nova-eefc3c1892c523100470414d00a981ea9fbdf3ca.tar.gz nova-eefc3c1892c523100470414d00a981ea9fbdf3ca.tar.xz nova-eefc3c1892c523100470414d00a981ea9fbdf3ca.zip | |
Use InstanceList object for init_host
Related to blueprint unified-object-model
Change-Id: Idcc4da2a6807a58966e267c62a7f134ce58c890a
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 8c593bda5..6d4835e0b 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -548,7 +548,7 @@ class ComputeManager(manager.SchedulerDependentManager): # NOTE(mriedem): check old_vm_state for STOPPED here, if it's # not in system_metadata we default to True for backwards # compatibility - sys_meta = utils.metadata_to_dict(instance['system_metadata']) + sys_meta = utils.instance_sys_meta(instance) power_on = sys_meta.get('old_vm_state') != vm_states.STOPPED block_dev_info = self._get_instance_volume_block_device_info( @@ -648,8 +648,8 @@ class ComputeManager(manager.SchedulerDependentManager): """Initialization for a standalone compute service.""" self.driver.init_host(host=self.host) context = nova.context.get_admin_context() - instances = self.conductor_api.instance_get_all_by_host(context, - self.host) + instances = instance_obj.InstanceList.get_by_host( + context, self.host, expected_attrs=['info_cache']) if CONF.defer_iptables_apply: self.driver.filter_defer_apply_on() |