Merge pull request #101 from stackhpc/upstream/2024.1-2025-10-20

Synchronise 2024.1 with upstream

Author: priteau

etc/metadefs/compute-vtpm-hw.json

@@ -17,14 +17,24 @@
     "properties": {
         "tpm_model": {
             "title": "TPM model",
-            "description": "TPM model to use. Option CRB is only valid for TPM version 2.0. Defaults to TIS.",
+            "description": "TPM model to use. Option tpm-crb is only valid for TPM version 2.0. Defaults to tpm-tis.",
             "operators": ["<or>"],
             "type": "string",
             "enum": [
-                "TIS",
-                "CRB"
+                "tpm-tis",
+                "tpm-crb"
             ],
-            "default": "TIS"
+            "default": "tpm-tis"
+        },
+        "tpm_version": {
+            "title": "TPM version",
+            "description": "TPM version to use. Required if requesting a vTPM. Model tpm-tis supports both, tpm-crb supports only 2.0.",
+            "operators": ["<or>"],
+            "type": "string",
+            "enum": [
+                "1.2",
+                "2.0"
+            ]
         }
     },
     "objects": []

glance/tests/functional/db/base_metadef.py

@@ -791,7 +791,7 @@ class MetadefLoadUnloadTests:
         'OS::Glance::CommonImageProperties': 10,
         'OS::Compute::GuestShutdownBehavior': 1,
         'OS::Compute::VMwareFlavor': 2,
-        'OS::Compute::TPM': 1,
+        'OS::Compute::TPM': 2,
         'OS::Compute::GuestMemoryBacking': 1,
         'OS::Compute::LibvirtImage': 16,
         'OS::Compute::VMware': 6,