x
/
nova-lxd
Code Issues Proposed changes

Align with move of hv_type -> fields.HVType & vm_mode -> fields.VMMode 

nova core has moved the hv_type module into the HVType class, and the vm_mode
module into the VMMode class, within the fields module.

This patch aligns nova-lxd with this change, resolving driver loading
issues in master branch.

Change-Id: I952ec41d6ee0281d70f911df57cb1013140acdcd
This commit is contained in:
Andy McCrae 2016-12-06 11:55:02 +00:00
parent 45048093d5
commit b78ee132b8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/virt/lxd/driver.py
View File

@ -54,9 +54,7 @@ from nova.api.metadata import base as instance_metadata
from nova.objects import fields as obj_fields
from nova.objects import migrate_data
from nova.virt import configdrive
from nova.compute import hv_type
from nova.compute import power_state
from nova.compute import vm_mode
from nova.compute import vm_states
from nova.virt import hardware
from oslo_utils import units
@ -926,10 +924,14 @@ class LXDDriver(driver.ComputeDriver):
'cpu_info': jsonutils.dumps(cpu_info),
'hypervisor_hostname': socket.gethostname(),
'supported_instances': [
(obj_fields.Architecture.I686, hv_type.LXD, vm_mode.EXE),
(obj_fields.Architecture.X86_64, hv_type.LXD, vm_mode.EXE),
(obj_fields.Architecture.I686, hv_type.LXC, vm_mode.EXE),
(obj_fields.Architecture.X86_64, hv_type.LXC, vm_mode.EXE),
(obj_fields.Architecture.I686, obj_fields.HVType.LXD,
obj_fields.VMMode.EXE),
(obj_fields.Architecture.X86_64, obj_fields.HVType.LXD,
obj_fields.VMMode.EXE),
(obj_fields.Architecture.I686, obj_fields.HVType.LXC,
obj_fields.VMMode.EXE),
(obj_fields.Architecture.X86_64, obj_fields.HVType.LXC,
obj_fields.VMMode.EXE),
],
'numa_topology': None,
}