[Merge] lp:~niedbalski/glance/kilo-fix-lp-1447193 into lp:~ubuntu-server-dev/glance/kilo

[Corey Bryant]

Thanks Jorge, I commented below.

Diff comments:

> 
> === added file 'debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch'
> --- debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch	1970-01-01 00:00:00 +0000
> +++ debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch	2015-07-31 15:09:47 +0000
> @@ -0,0 +1,42 @@
> +From 3e34543fe0c563beb2746f9655ed5d12ff157949 Mon Sep 17 00:00:00 2001
> +From: Jorge Niedbalski <jorge.niedbalski at canonical.com>
> +Date: Wed, 22 Apr 2015 12:54:29 -0300
> +Subject: [PATCH] Allow ramdisk_id, kernel_id to be null on schema
> +
> +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.
> +
> +Closes-Bug: #1447215
> +Related-Bug: #1447193
> +
> +Change-Id: I645c797553ccaa84062f9ad28f2349ae738a0c96
> +Signed-off-by: Jorge Niedbalski <jorge.niedbalski at canonical.com>
> +---
> + etc/schema-image.json | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/etc/schema-image.json b/etc/schema-image.json
> +index 5aafd6b..d9f433b 100644
> +--- a/etc/schema-image.json
> ++++ b/etc/glance/schema-image.json

This seems to be a little different from the upstream patch.  Is there a reason, and if not can you resubmit the patch directly from the upstream stable/kilo branch?  The other patch is fine, but it's landed upstream now in 2015.1.1 so you can drop it from this mp.

> +@@ -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."
> +     },
> +-- 
> +2.1.4
> +


-- 
https://code.launchpad.net/~niedbalski/glance/kilo-fix-lp-1447193/+merge/266586
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~niedbalski/glance/kilo-fix-lp-1447193 into lp:~ubuntu-server-dev/glance/kilo.