Fix unable to create vm with GPU/Crypto passthrough devices

class_id should not be included passthrough_whitelist for helm
overrides and nova.conf

Verified both QAT and GPU passthrough VM created successfully

Closes-Bug: #1824831
Change-Id: Ie045e4dfb3ffde58dedfc99311a1073fb3b8dee3
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2019-05-07 23:52:00 +08:00 committed by zhipeng liu
parent 639ef13667
commit 05b7f6d445
2 changed files with 2 additions and 6 deletions

View File

@ -36,8 +36,7 @@ DEFAULT_NOVA_PCI_ALIAS = [
{"vendor_id": constants.NOVA_PCI_ALIAS_QAT_VF_VENDOR,
"product_id": constants.NOVA_PCI_ALIAS_QAT_C62X_VF_DEVICE,
"name": constants.NOVA_PCI_ALIAS_QAT_C62X_VF_NAME},
{"class_id": constants.NOVA_PCI_ALIAS_GPU_CLASS,
"name": constants.NOVA_PCI_ALIAS_GPU_NAME}
{"name": constants.NOVA_PCI_ALIAS_GPU_NAME}
]
SERVICE_PARAM_NOVA_PCI_ALIAS = [
@ -263,7 +262,6 @@ class NovaHelm(openstack.OpenstackBaseHelm):
if pci_device.enabled:
device = {
'address': pci_device.pciaddr,
'class_id': pci_device.pclass_id
}
LOG.debug('_get_pci_pt_whitelist '
'host=%s, device=%s', host.hostname, device)

View File

@ -57,8 +57,7 @@ DEFAULT_NOVA_PCI_ALIAS = [
"product_id": constants.NOVA_PCI_ALIAS_QAT_C62X_VF_DEVICE,
"name": constants.NOVA_PCI_ALIAS_QAT_C62X_VF_NAME},
{"class_id": constants.NOVA_PCI_ALIAS_GPU_CLASS,
"name": constants.NOVA_PCI_ALIAS_GPU_NAME}
{"name": constants.NOVA_PCI_ALIAS_GPU_NAME}
]
SERVICE_PARAM_NOVA_PCI_ALIAS = [
@ -582,7 +581,6 @@ class NovaPuppet(openstack.OpenstackBasePuppet):
if pci_device.enabled:
device = {
'address': pci_device.pciaddr,
'class_id': pci_device.pclass_id
}
devices.append(device)