From 7c4eda8f62b74fec039214c150709db488242a79 Mon Sep 17 00:00:00 2001 From: khashf Date: Tue, 7 Apr 2020 18:12:40 -0700 Subject: [PATCH] Update OS::Glance::CommonImageProperties in metadefs Add missing properties, as of Train, defined in etc/schema-image.json for OS::Glance::CommonImageProperties defined in etc/metadefs/glance-common-image-props.json Change-Id: I3e6d2ab88cca41bbf66dbced8b576637f13b9f57 Closes-bug: #1856581 --- etc/metadefs/glance-common-image-props.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/etc/metadefs/glance-common-image-props.json b/etc/metadefs/glance-common-image-props.json index 636ff3a0a7..74c251dbea 100644 --- a/etc/metadefs/glance-common-image-props.json +++ b/etc/metadefs/glance-common-image-props.json @@ -37,6 +37,25 @@ "title": "OS Version", "description": "Operating system version as specified by the distributor. (for example, '11.10')", "type": "string" + }, + "description": { + "title": "Image description", + "description": "A human-readable string describing this image.", + "type": "string" + }, + "cinder_encryption_key_id": { + "title": "Cinder Encryption Key ID", + "description": "Identifier in the OpenStack Key Management Service for the encryption key for the Block Storage Service to use when mounting a volume created from this image", + "type": "string" + }, + "cinder_encryption_key_deletion_policy": { + "title": "Cinder Encryption Key Deletion Policy", + "description": "States the condition under which the Image Service will delete the object associated with the 'cinder_encryption_key_id' image property. If this property is missing, the Image Service will take no action", + "type": "string", + "enum": [ + "on_image_deletion", + "do_not_delete" + ] } } }