diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-07 08:48:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-07 08:48:41 +0000 |
| commit | f0f0be965b0e7ec6a348a7297854176c5329b9fe (patch) | |
| tree | 293b66cc6fca8c31bae83da17e1b14890f0a6442 | |
| parent | 4817c5af222b4c7ee46194c78e917812f5c0787c (diff) | |
| parent | 3c0ff8d94562bf42d4092db0aaad04fb5cc93fe3 (diff) | |
| download | glance-f0f0be965b0e7ec6a348a7297854176c5329b9fe.tar.gz | |
Merge "Make compute-trust.json compatible with TrustFilter" into proposed/juno
| -rw-r--r-- | etc/metadefs/compute-trust.json | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/etc/metadefs/compute-trust.json b/etc/metadefs/compute-trust.json index 58b2cd835..7df5691be 100644 --- a/etc/metadefs/compute-trust.json +++ b/etc/metadefs/compute-trust.json @@ -1,7 +1,7 @@ { "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.", + "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": [ @@ -12,8 +12,13 @@ "properties": { "trust:trusted_host": { "title": "Intel® TXT attestation", - "description": "Select to ensure that node has been attested by Intel® Trusted Execution Technology (Intel® TXT).", - "type": "boolean" + "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 |