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

[Jorge Niedbalski]

This change fixes LP: #1419823 and LP: #1447215

[Corey Bryant (corey.bryant)]

Thanks Jorge, I commented below.

[lp:~niedbalski/glance/kilo-fix-lp-1447193]

340. By Jorge Niedbalski on 2015-08-04

d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch:
Allow ramdisk_id, kernel_id to be null on schema. (LP: #1447215).

Addressed @coreycb comments.

341. By Jorge Niedbalski on 2015-08-04

Addressed @coreycb comments.

342. By Jorge Niedbalski on 2015-08-04

Addressed @coreycb comments

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-03 17:44:22 +0000
+++ debian/changelog	2015-08-04 13:54:43 +0000
@@ -1,3 +1,10 @@
+glance (1:2015.1.0-0ubuntu2) vivid; urgency=medium
+
+  * d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch: 
+    Allow ramdisk_id, kernel_id to be null on schema. (LP: #1447215).
+
+ -- Jorge Niedbalski <[e-mail]>  Fri, 31 Jul 2015 11:32:52 -0300
+
 glance (1:2015.1.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release for OpenStack kilo. (LP: #1449744)
 
=== 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-08-04 13:54:43 +0000
@@ -0,0 +1,45 @@
+From 4b269775964f75300d3af56a4c57234d54a32e94 Mon Sep 17 00:00:00 2001
+From: Jorge Niedbalski <[e-mail]>
+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.
+
+APIImpact
+
+Closes-Bug: #1447215
+Related-Bug: #1447193
+
+Change-Id: I645c797553ccaa84062f9ad28f2349ae738a0c96
+Signed-off-by: Jorge Niedbalski <[e-mail]>
+(cherry picked from commit 82c63b1df4399db22dfd71e3326a6bfc1b372a9c)
+---
+ 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/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."
+     },
+-- 
+2.1.4
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-10 18:17:03 +0000
+++ debian/patches/series	2015-08-04 13:54:43 +0000
@@ -1,2 +1,3 @@
 sql_conn.patch
 fix-requirements.patch
+0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch