kvm: improve numa error message

karmab · Nov 26, 2024 · 3ce18d0 · 3ce18d0
1 parent 2e4ab89
commit 3ce18d0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/kvirt/cluster/hypershift/__init__.py b/kvirt/cluster/hypershift/__init__.py
@@ -20,7 +20,7 @@
 from urllib.request import urlopen, Request
 from yaml import safe_dump, safe_load
 
-virt_providers = ['kvm', 'kubevirt', 'ovirt', 'openstack', 'vsphere', 'proxmox']
+virt_providers = ['kvm', 'kubevirt', 'ovirt', 'openstack', 'proxmox', 'vsphere']
 cloud_providers = ['aws', 'azure', 'gcp', 'ibm', 'hcloud']
 
 

diff --git a/kvirt/cluster/hypershift/kcli_plan.yml b/kvirt/cluster/hypershift/kcli_plan.yml
@@ -57,7 +57,7 @@
  memory: {{ worker_memory | default(memory, memory) }}
  nets: {{ [net0] + extra_networks }}
  disks: {{ [disk_size] + extra_disks }}
-{% if config_type in ['kvm', 'vsphere', 'ovirt', 'kubevirt'] %}
+{% if config_type in ['kvm', 'kubevirt', 'openstack', 'ovirt', 'proxmox', 'vsphere'] %}
  files: {{ files }}
 {% endif %}
 {% endfor %}
diff --git a/kvirt/cluster/hypershift/kcli_plan_assisted.yml b/kvirt/cluster/hypershift/kcli_plan_assisted.yml
@@ -5,8 +5,8 @@
   start: false
   kube: {{ cluster }}
   kubetype: hypershift
-  memory: {{ memory }}
-  numcpus: {{ numcpus }}
+  numcpus: {{ worker_numcpus | default(numcpus, numcpus) }}
+  memory:  {{ worker_memory | default(memory, memory) }}
   disks:
   - size: {{ disk_size }}
     interface: sata

diff --git a/kvirt/cluster/openshift/__init__.py b/kvirt/cluster/openshift/__init__.py
@@ -24,7 +24,7 @@
 from yaml import safe_dump, safe_load
 
 
-virt_providers = ['kvm', 'kubevirt', 'ovirt', 'openstack', 'vsphere', 'proxmox']
+virt_providers = ['kvm', 'kubevirt', 'openstack', 'ovirt', 'proxmox', 'vsphere']
 cloud_providers = ['aws', 'azure', 'gcp', 'ibm', 'hcloud']
 
 

diff --git a/kvirt/common/__init__.py b/kvirt/common/__init__.py
@@ -1273,7 +1273,8 @@ def get_latest_rhcos(url, _type='kvm', arch='x86_64', qemu=False):
 
 
 def get_installer_rhcos(_type='kvm', region=None, arch='x86_64'):
-    keys = {'ovirt': 'openstack', 'kubevirt': 'openstack', 'kvm': 'qemu', 'vsphere': 'vmware', 'ibm': 'ibmcloud'}
+    keys = {'ovirt': 'openstack', 'kubevirt': 'openstack', 'kvm': 'qemu', 'vsphere': 'vmware', 'ibm': 'ibmcloud',
+            'proxmox': 'openstack'}
     key = keys.get(_type, _type)
     INSTALLER_COREOS = os.popen('openshift-install coreos print-stream-json 2>/dev/null').read()
     data = json.loads(INSTALLER_COREOS)

diff --git a/kvirt/providers/kvm/__init__.py b/kvirt/providers/kvm/__init__.py
@@ -1017,7 +1017,7 @@ def create(self, name, virttype=None, profile='kvirt', flavor=None, plan='kvirt'
                         count += 1
                 cpuxml += f'{numaxml}</numa>'
                 if numamemory > memory:
-                    msg = "Can't use more memory for numa than assigned memory"
+                    msg = "Can't use more memory for numa than assigned one ({memory})"
                     return {'result': 'failure', 'reason': msg}
             elif memoryhotplug:
                 lastcpu = int(numcpus) - 1