openstack/glance
Code Issues Proposed changes

Merge "Fix vTPM metadefs."

Browse Source
This commit is contained in:
Zuul 2025-04-29 22:43:56 +00:00 committed by Gerrit Code Review
commit 55158e2ac1
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etc/metadefs/compute-vtpm-hw.json
View File

@ -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": []

2
glance/tests/functional/db/base_metadef.py
View File

@ -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': 17,
'OS::Compute::VMware': 6,