Skip to content

Commit

Permalink
Allow ramdisk_id, kernel_id to be null on schema
Browse files Browse the repository at this point in the history
Since is possible to create images with no
ramdisk_id, kernel_id parameters on glance v1,
then the schema-image.json needs to be modified to
allow null, string values for both attributes
and prevent LP #1447193 to happen with a glance v2
client.

APIImpact

Closes-Bug: #1447215
Related-Bug: #1447193

Change-Id: I645c797553ccaa84062f9ad28f2349ae738a0c96
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@canonical.com>
  • Loading branch information
bilboer authored and Stuart McLaren committed Jul 23, 2015
1 parent ef334a6 commit 82c63b1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions etc/schema-image.json
@@ -1,11 +1,11 @@
{
"kernel_id": {
"type": "string",
"type": ["null", "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",
"type": ["null", "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."
},
Expand Down

0 comments on commit 82c63b1

Please sign in to comment.