From e89929fde2deb3454935ad6441f33a1c5a5aecf0 Mon Sep 17 00:00:00 2001
From: Paul-Emile Element <Paul-Emile.Element@windriver.com>
Date: Fri, 25 Jan 2019 12:02:04 -0600
Subject: [PATCH] Add flavor and image options to select emulated virtual tpm

This commit adds three new flavor/image options to the interface.
The new options will allow the user to select and configure an
emulated virtual TPM in the guest. The new options are:

traits:COMPUTE_SECURITY_TPM_1_2
traits:COMPUTE_SECURITY_TPM_2_0
hw:tpm_model

nova blueprint: add-emulated-virtual-tpm

Change-Id: I1ff51f608b85dbb621814e70079ecfdd3d1a1d22
Signed-off-by: Paul-Emile Element <Paul-Emile.Element@windriver.com>
Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
---
 etc/metadefs/compute-vtpm-hw.json | 31 +++++++++++++++++++++++++
 etc/metadefs/compute-vtpm.json    | 38 +++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 etc/metadefs/compute-vtpm-hw.json
 create mode 100644 etc/metadefs/compute-vtpm.json

diff --git a/etc/metadefs/compute-vtpm-hw.json b/etc/metadefs/compute-vtpm-hw.json
new file mode 100644
index 0000000000..0a4f060269
--- /dev/null
+++ b/etc/metadefs/compute-vtpm-hw.json
@@ -0,0 +1,31 @@
+{
+    "namespace": "OS::Compute::TPM",
+    "display_name": "TPM Options",
+    "description": "Configuration options for TPM",
+    "visibility": "public",
+    "protected": true,
+    "resource_type_associations": [
+        {
+            "name": "OS::Nova::Flavor",
+            "prefix": "hw:"
+        },
+        {
+            "name": "OS::Glance::Image",
+            "prefix": "hw_"
+        }
+    ],
+    "properties": {
+        "tpm_model": {
+            "title": "TPM model",
+            "description": "TPM model to use. Option CRB is only valid for TPM version 2.0. Defaults to TIS.",
+            "operators": ["<or>"],
+            "type": "string",
+            "enum": [
+                "TIS",
+                "CRB"
+            ],
+            "default": "TIS"
+        }
+    },
+    "objects": []
+}
diff --git a/etc/metadefs/compute-vtpm.json b/etc/metadefs/compute-vtpm.json
new file mode 100644
index 0000000000..22017d681b
--- /dev/null
+++ b/etc/metadefs/compute-vtpm.json
@@ -0,0 +1,38 @@
+{
+    "namespace": "OS::Compute::VTPM",
+    "display_name": "Emulated Virtual TPM",
+    "description": "Configuration options for Emulated Virtual TPM",
+    "visibility": "public",
+    "protected": true,
+    "resource_type_associations": [
+        {
+            "name": "OS::Nova::Flavor",
+            "prefix": "traits:"
+        },
+        {
+            "name": "OS::Glance::Image",
+            "prefix": "traits:"
+        }
+    ],
+    "properties": {
+        "COMPUTE_SECURITY_TPM_1_2": {
+            "title": "Virtual TPM Version 1.2 Support",
+            "description": "Enables virtual TPM version 1.2.",
+            "type": "string",
+            "enum": [
+                "required"
+            ],
+            "default": "required"
+        },
+        "COMPUTE_SECURITY_TPM_2_0": {
+            "title": "Virtual TPM Version 2.0 Support",
+            "description": "Enables virtual TPM version 2.0.",
+            "type": "string",
+            "enum": [
+                "required"
+            ],
+            "default": "required"
+        }
+    },
+    "objects": []
+}