nova/flavors: Add KVM v1 (Cascade-Lake) flavors

As agreed in ADR core/nova/0008 "KVM flavor naming scheme" the KVM flavors (and eventually, but not in this change, the VMware flavors too) gain a new hypervisor field after the g/c/m purpose field. It's "k" for KVM/Qemu (and will be "v" for VMware). Also the flavors will be suffixed with a "v1" hardware generation number for Cascade Lake right away. So, the KVM counterpart for "g_c4_m16" is named "g_k_c4_m16_v1". A per-region config flag `kvm_enabled` is introduced, defaulting to false, to allow per-region enablement of KVM flavors.
sapcc · Oct 17, 2024 · e862f2c · e862f2c
1 parent 592dcee
commit e862f2c
Show file tree

Hide file tree

Showing 4 changed files with 648 additions and 1 deletion.
diff --git a/openstack/sap-seeds/templates/_flavors_hana_exclusive.tpl b/openstack/sap-seeds/templates/_flavors_hana_exclusive.tpl
@@ -225,3 +225,111 @@
     "quota:instance_only": "true"
     "quota:separate": "true"
     {{- end }}
+
+# KVM HANA Flavors
+{{- if .Values.kvm_enabled }}
+- name: "hana_c30_m240_k1"
+  id: "320"
+  vcpus: 30
+  ram: 245760
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "28"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c60_m480_k1"
+  id: "321"
+  vcpus: 60
+  ram: 491520
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "57"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c120_m960_k1"
+  id: "322"
+  vcpus: 120
+  ram: 983040
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "114"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c30_m480_k1"
+  id: "323"
+  vcpus: 30
+  ram: 491520
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "28"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c60_m960_k1"
+  id: "324"
+  vcpus: 60
+  ram: 983040
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "57"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c120_m1920_k1"
+  id: "325"
+  vcpus: 120
+  ram: 1966080
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "114"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c180_m2880_k1"
+  id: "326"
+  vcpus: 180
+  ram: 2949120
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "171"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_c240_m3840_k1"
+  id: "327"
+  vcpus: 240
+  ram: 3932160
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_hana" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    "reservation:cpu": "228"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+{{- end}}  # kvm_enabled
diff --git a/openstack/sap-seeds/templates/_flavors_hana_no_exclusive.tpl b/openstack/sap-seeds/templates/_flavors_hana_no_exclusive.tpl
@@ -211,3 +211,106 @@
     "quota:instance_only": "true"
     "quota:separate": "true"
     {{- end }}
+
+# KVM HANA flavors
+{{- if .Values.kvm_enabled }}
+- name: "hana_k_c30_m240_v1"
+  id: "320"
+  vcpus: 30
+  ram: 245760
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c60_m480_v1"
+  id: "321"
+  vcpus: 60
+  ram: 491520
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c120_m960_v1"
+  id: "322"
+  vcpus: 120
+  ram: 983040
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c30_m480_v1"
+  id: "323"
+  vcpus: 30
+  ram: 491520
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c60_m960_v1"
+  id: "324"
+  vcpus: 60
+  ram: 983040
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c120_m1920_v1"
+  id: "325"
+  vcpus: 120
+  ram: 1966080
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "resources:CUSTOM_BIGVM": "2"
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c180_m2880_v1"
+  id: "326"
+  vcpus: 180
+  ram: 2949120
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "resources:CUSTOM_BIGVM": "2"
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+- name: "hana_k_c240_m3840_v1"
+  id: "327"
+  vcpus: 240
+  ram: 3932160
+  disk: 64
+  extra_specs:
+    {{ tuple . "kvm_common" | include "sap_seeds.helpers.extra_specs" | indent 4 }}
+    "resources:CUSTOM_BIGVM": "2"
+    "trait:CUSTOM_NUMASIZE_C48_M729": "required"
+    {{- if ( .Values.hana_flavors_quota_separate ) }}
+    "quota:instance_only": "true"
+    "quota:separate": "true"
+    {{- end }}
+{{- end}}  # kvm_enabled