starlingx
/
openstack-armada-app
Code Issues Proposed changes

Remove Nova prefix 

In this commit, removed NOVA prefix from the constants as this is a
historical artifact tracing back to an openstack-only solution.

TEST PLAN:

PASS: build success of stx-openstack-helm-fluxcd and
      python3-k8sapp-openstack
      "build-pkgs -c -p stx-openstack-helm-fluxcd"
      "build-pkgs -c -p python3-k8sapp-openstack"
PASS: bootstrap is success

Story: 2010604
Task: 48428

Depends-On: https://review.opendev.org/c/starlingx/config/+/889011
Change-Id: If8b0cc8d0750d11f7604ce419e3837b1e7f7c908
Signed-off-by: Md Irshad Sheikh <mdirshad.sheikh@windriver.com>
This commit is contained in:
Md Irshad Sheikh 2023-07-20 05:22:06 -04:00 committed by Md Irshad Sheikh
parent b99b793368
commit da73bc7582
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py
View File

@ -81,19 +81,19 @@ FLUXCD_HELMRELEASE_DCDBSYNC = 'dcdbsync'
# Nova PCI Alias types and names
# NOTE: Generic GPU and QAT definitions reside in sysinv/common/constants.py
# and are required by sysinv-agent and puppet for PCI devices inventory.
NOVA_PCI_ALIAS_DEVICE_TYPE_PCI = "type-PCI"
NOVA_PCI_ALIAS_DEVICE_TYPE_PF = "type-PF"
NOVA_PCI_ALIAS_DEVICE_TYPE_VF = "type-VF"
NOVA_PCI_ALIAS_GPU_MATROX_VENDOR = "102b"
NOVA_PCI_ALIAS_GPU_MATROX_G200E_DEVICE = "0522"
NOVA_PCI_ALIAS_GPU_MATROX_G200E_NAME = "matrox-g200e"
NOVA_PCI_ALIAS_GPU_NVIDIA_VENDOR = "10de"
NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_M60_DEVICE = "13f2"
NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_M60_NAME = "nvidia-tesla-m60"
NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_P40_DEVICE = "1b38"
NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_P40_NAME = "nvidia-tesla-p40"
NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_DEVICE = "1eb8"
NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_NAME = "nvidia-tesla-t4-pf"
PCI_ALIAS_DEVICE_TYPE_PCI = "type-PCI"
PCI_ALIAS_DEVICE_TYPE_PF = "type-PF"
PCI_ALIAS_DEVICE_TYPE_VF = "type-VF"
PCI_ALIAS_GPU_MATROX_VENDOR = "102b"
PCI_ALIAS_GPU_MATROX_G200E_DEVICE = "0522"
PCI_ALIAS_GPU_MATROX_G200E_NAME = "matrox-g200e"
PCI_ALIAS_GPU_NVIDIA_VENDOR = "10de"
PCI_ALIAS_GPU_NVIDIA_TESLA_M60_DEVICE = "13f2"
PCI_ALIAS_GPU_NVIDIA_TESLA_M60_NAME = "nvidia-tesla-m60"
PCI_ALIAS_GPU_NVIDIA_TESLA_P40_DEVICE = "1b38"
PCI_ALIAS_GPU_NVIDIA_TESLA_P40_NAME = "nvidia-tesla-p40"
PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_DEVICE = "1eb8"
PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_NAME = "nvidia-tesla-t4-pf"
CEPH_POOL_IMAGES_NAME = 'images'
CEPH_POOL_IMAGES_CHUNK_SIZE = 256

56
python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
View File

@ -26,33 +26,33 @@ LOG = logging.getLogger(__name__)
# behavior defined in nova/virt/libvirt/volume/net.py:_set_auth_config_rbd()
RBD_POOL_USER = "cinder"
DEFAULT_NOVA_PCI_ALIAS = [
{"vendor_id": constants.NOVA_PCI_ALIAS_QAT_PF_VENDOR,
"product_id": constants.NOVA_PCI_ALIAS_QAT_DH895XCC_PF_DEVICE,
"name": constants.NOVA_PCI_ALIAS_QAT_DH895XCC_PF_NAME},
{"vendor_id": constants.NOVA_PCI_ALIAS_QAT_VF_VENDOR,
"product_id": constants.NOVA_PCI_ALIAS_QAT_DH895XCC_VF_DEVICE,
"name": constants.NOVA_PCI_ALIAS_QAT_DH895XCC_VF_NAME},
{"vendor_id": constants.NOVA_PCI_ALIAS_QAT_PF_VENDOR,
"product_id": constants.NOVA_PCI_ALIAS_QAT_C62X_PF_DEVICE,
"name": constants.NOVA_PCI_ALIAS_QAT_C62X_PF_NAME},
{"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},
{"name": constants.NOVA_PCI_ALIAS_GPU_NAME},
{"vendor_id": app_constants.NOVA_PCI_ALIAS_GPU_MATROX_VENDOR,
"product_id": app_constants.NOVA_PCI_ALIAS_GPU_MATROX_G200E_DEVICE,
"name": app_constants.NOVA_PCI_ALIAS_GPU_MATROX_G200E_NAME},
{"vendor_id": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_VENDOR,
"product_id": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_M60_DEVICE,
"name": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_M60_NAME},
{"vendor_id": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_VENDOR,
"product_id": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_P40_DEVICE,
"name": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_P40_NAME},
{"vendor_id": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_VENDOR,
"product_id": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_DEVICE,
"device_type": app_constants.NOVA_PCI_ALIAS_DEVICE_TYPE_PF,
"name": app_constants.NOVA_PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_NAME},
DEFAULT_PCI_ALIAS = [
{"vendor_id": constants.PCI_ALIAS_QAT_PF_VENDOR,
"product_id": constants.PCI_ALIAS_QAT_DH895XCC_PF_DEVICE,
"name": constants.PCI_ALIAS_QAT_DH895XCC_PF_NAME},
{"vendor_id": constants.PCI_ALIAS_QAT_VF_VENDOR,
"product_id": constants.PCI_ALIAS_QAT_DH895XCC_VF_DEVICE,
"name": constants.PCI_ALIAS_QAT_DH895XCC_VF_NAME},
{"vendor_id": constants.PCI_ALIAS_QAT_PF_VENDOR,
"product_id": constants.PCI_ALIAS_QAT_C62X_PF_DEVICE,
"name": constants.PCI_ALIAS_QAT_C62X_PF_NAME},
{"vendor_id": constants.PCI_ALIAS_QAT_VF_VENDOR,
"product_id": constants.PCI_ALIAS_QAT_C62X_VF_DEVICE,
"name": constants.PCI_ALIAS_QAT_C62X_VF_NAME},
{"name": constants.PCI_ALIAS_GPU_NAME},
{"vendor_id": app_constants.PCI_ALIAS_GPU_MATROX_VENDOR,
"product_id": app_constants.PCI_ALIAS_GPU_MATROX_G200E_DEVICE,
"name": app_constants.PCI_ALIAS_GPU_MATROX_G200E_NAME},
{"vendor_id": app_constants.PCI_ALIAS_GPU_NVIDIA_VENDOR,
"product_id": app_constants.PCI_ALIAS_GPU_NVIDIA_TESLA_M60_DEVICE,
"name": app_constants.PCI_ALIAS_GPU_NVIDIA_TESLA_M60_NAME},
{"vendor_id": app_constants.PCI_ALIAS_GPU_NVIDIA_VENDOR,
"product_id": app_constants.PCI_ALIAS_GPU_NVIDIA_TESLA_P40_DEVICE,
"name": app_constants.PCI_ALIAS_GPU_NVIDIA_TESLA_P40_NAME},
{"vendor_id": app_constants.PCI_ALIAS_GPU_NVIDIA_VENDOR,
"product_id": app_constants.PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_DEVICE,
"device_type": app_constants.PCI_ALIAS_DEVICE_TYPE_PF,
"name": app_constants.PCI_ALIAS_GPU_NVIDIA_TESLA_T4_PF_NAME},
]
@ -340,7 +340,7 @@ class NovaHelm(openstack.OpenstackBaseHelm):
to generate one-line-per-entry formatting, since JSON list of
dict is not supported by nova.
"""
alias_config = DEFAULT_NOVA_PCI_ALIAS[:]
alias_config = DEFAULT_PCI_ALIAS[:]
LOG.debug('_get_pci_alias: aliases = %s', alias_config)
multistring = self._oslo_multistring_override(
name='alias', values=alias_config)