Merge "Glance: use upstream schema-image.json"

This commit is contained in:
Jenkins 2013-12-16 09:26:15 +00:00 committed by Gerrit Code Review
commit 1667efa81a
2 changed files with 1 additions and 16 deletions

View File

@ -6,6 +6,7 @@ install-packages python-mysqldb libssl-dev
os-svc-install -n glance -u glance -r /opt/stack/glance
cp /opt/stack/glance/etc/policy.json /etc/glance/policy.json
cp /opt/stack/glance/etc/schema-image.json /etc/glance/schema-image.json
cp /opt/stack/glance/etc/glance-api-paste.ini /etc/glance/glance-api-paste.ini
cp /opt/stack/glance/etc/glance-registry-paste.ini /etc/glance/glance-registry-paste.ini

View File

@ -1,16 +0,0 @@
{
"kernel_id": {
"type": "string",
"pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",
"description": "ID of image stored in Glance that should be used as the kernel when booting an AMI-style image."
},
"ramdisk_id": {
"type": "string",
"pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",
"description": "ID of image stored in Glance that should be used as the ramdisk when booting an AMI-style image."
},
"instance_uuid": {
"type": "string",
"description": "ID of instance used to create this image."
}
}