From b78abdfa0ebc159263e9470a8636618927893a2b Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Tue, 17 Sep 2019 09:45:52 -0400
Subject: [PATCH] Remove OS::Compute::Trust metadef

The nova TrustedFilter scheduler filter was removed in the Queens
release [1] so the compute trust metadef is now just noise so we
should remove it.

[1] https://review.opendev.org/506864/

Change-Id: I71825cd5317d458fa30287b78cd1030cbc457dbd
---
 .../metadef-namespaces-list-response.json     | 19 ---------------
 etc/metadefs/compute-trust.json               | 24 -------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 etc/metadefs/compute-trust.json

diff --git a/api-ref/source/v2/samples/metadef-namespaces-list-response.json b/api-ref/source/v2/samples/metadef-namespaces-list-response.json
index 0c5984127c..517b1e3e06 100644
--- a/api-ref/source/v2/samples/metadef-namespaces-list-response.json
+++ b/api-ref/source/v2/samples/metadef-namespaces-list-response.json
@@ -39,25 +39,6 @@
             "updated_at": "2014-08-28T17:13:06Z",
             "visibility": "public"
         },
-        {
-            "created_at": "2014-08-28T17:13:06Z",
-            "description": "Trusted compute pools with Intel\u00ae Trusted Execution Technology (Intel\u00ae TXT) support IT compliance by protecting virtualized data centers - private, public, and hybrid clouds against attacks toward hypervisor and BIOS, firmware, and other pre-launch software components.",
-            "display_name": "Trusted Compute Pools (Intel\u00ae TXT)",
-            "namespace": "OS::Compute::Trust",
-            "owner": "admin",
-            "protected": true,
-            "resource_type_associations": [
-                {
-                    "created_at": "2014-08-28T17:13:06Z",
-                    "name": "OS::Nova::Flavor",
-                    "updated_at": "2014-08-28T17:13:06Z"
-                }
-            ],
-            "schema": "/v2/schemas/metadefs/namespace",
-            "self": "/v2/metadefs/namespaces/OS::Compute::Trust",
-            "updated_at": "2014-08-28T17:13:06Z",
-            "visibility": "public"
-        },
         {
             "created_at": "2014-08-28T17:13:06Z",
             "description": "This provides the preferred socket/core/thread counts for the virtual CPU instance exposed to guests. This enables the ability to avoid hitting limitations on vCPU topologies that OS vendors place on their products. See also: https://opendev.org/openstack/nova-specs/src/branch/master/specs/juno/implemented/virt-driver-vcpu-topology.rst",
diff --git a/etc/metadefs/compute-trust.json b/etc/metadefs/compute-trust.json
deleted file mode 100644
index 7df5691be3..0000000000
--- a/etc/metadefs/compute-trust.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "namespace": "OS::Compute::Trust",
-    "display_name": "Trusted Compute Pools (Intel® TXT)",
-    "description": "Trusted compute pools with Intel® Trusted Execution Technology (Intel® TXT) support IT compliance by protecting virtualized data centers - private, public, and hybrid clouds against attacks toward hypervisor and BIOS, firmware, and other pre-launch software components. The Nova trust scheduling filter must be enabled and configured with the trust attestation service in order to use this feature.",
-    "visibility": "public",
-    "protected": true,
-    "resource_type_associations": [
-        {
-            "name": "OS::Nova::Flavor"
-        }
-    ],
-    "properties": {
-        "trust:trusted_host": {
-            "title": "Intel® TXT attestation",
-            "description": "Select to ensure that node has been attested by Intel® Trusted Execution Technology (Intel® TXT). The Nova trust scheduling filter must be enabled and configured with the trust attestation service in order to use this feature.",
-            "type": "string",
-            "enum": [
-                "trusted",
-                "untrusted",
-                "unknown"
-            ]
-        }
-    }
-}
\ No newline at end of file