From 05b7f6d4450ce1afc8e3f8b2d41f24ea647176a7 Mon Sep 17 00:00:00 2001 From: zhipengl Date: Tue, 7 May 2019 23:52:00 +0800 Subject: [PATCH] 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 --- sysinv/sysinv/sysinv/sysinv/helm/nova.py | 4 +--- sysinv/sysinv/sysinv/sysinv/puppet/nova.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova.py b/sysinv/sysinv/sysinv/sysinv/helm/nova.py index 1aae257966..9866e383c9 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/nova.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/nova.py @@ -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) diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/nova.py b/sysinv/sysinv/sysinv/sysinv/puppet/nova.py index c34b1bcb4e..dac226a43d 100644 --- a/sysinv/sysinv/sysinv/sysinv/puppet/nova.py +++ b/sysinv/sysinv/sysinv/sysinv/puppet/nova.py @@ -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)