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

Proposed by Jorge Niedbalski on 2015-07-31
Status: Merged
Merged at revision: 339
Proposed branch: lp:~niedbalski/glance/kilo-fix-lp-1447193
Merge into: lp:~ubuntu-server-dev/glance/kilo
Diff against target: 72 lines (+53/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch (+45/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~niedbalski/glance/kilo-fix-lp-1447193
Reviewer Review Type Date Requested Status
Corey Bryant 2015-07-31 Approve on 2015-08-04
Review via email: mp+266586@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Corey Bryant (corey.bryant) wrote :

Thanks Jorge, I commented below.

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-05-03 17:44:22 +0000
3+++ debian/changelog 2015-08-04 13:54:43 +0000
4@@ -1,3 +1,10 @@
5+glance (1:2015.1.0-0ubuntu2) vivid; urgency=medium
6+
7+ * d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch:
8+ Allow ramdisk_id, kernel_id to be null on schema. (LP: #1447215).
9+
10+ -- Jorge Niedbalski <jorge.niedbalski@canonical.com> Fri, 31 Jul 2015 11:32:52 -0300
11+
12 glance (1:2015.1.0-0ubuntu1) vivid; urgency=medium
13
14 * New upstream release for OpenStack kilo. (LP: #1449744)
15
16=== added file 'debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch'
17--- debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch 2015-08-04 13:54:43 +0000
19@@ -0,0 +1,45 @@
20+From 4b269775964f75300d3af56a4c57234d54a32e94 Mon Sep 17 00:00:00 2001
21+From: Jorge Niedbalski <jorge.niedbalski@canonical.com>
22+Date: Wed, 22 Apr 2015 12:54:29 -0300
23+Subject: [PATCH] Allow ramdisk_id, kernel_id to be null on schema
24+
25+Since is possible to create images with no
26+ramdisk_id, kernel_id parameters on glance v1,
27+then the schema-image.json needs to be modified to
28+allow null, string values for both attributes
29+and prevent LP #1447193 to happen with a glance v2
30+client.
31+
32+APIImpact
33+
34+Closes-Bug: #1447215
35+Related-Bug: #1447193
36+
37+Change-Id: I645c797553ccaa84062f9ad28f2349ae738a0c96
38+Signed-off-by: Jorge Niedbalski <jorge.niedbalski@canonical.com>
39+(cherry picked from commit 82c63b1df4399db22dfd71e3326a6bfc1b372a9c)
40+---
41+ etc/schema-image.json | 4 ++--
42+ 1 file changed, 2 insertions(+), 2 deletions(-)
43+
44+diff --git a/etc/schema-image.json b/etc/schema-image.json
45+index 5aafd6b..d9f433b 100644
46+--- a/etc/schema-image.json
47++++ b/etc/schema-image.json
48+@@ -1,11 +1,11 @@
49+ {
50+ "kernel_id": {
51+- "type": "string",
52++ "type": ["null", "string"],
53+ "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}$",
54+ "description": "ID of image stored in Glance that should be used as the kernel when booting an AMI-style image."
55+ },
56+ "ramdisk_id": {
57+- "type": "string",
58++ "type": ["null", "string"],
59+ "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}$",
60+ "description": "ID of image stored in Glance that should be used as the ramdisk when booting an AMI-style image."
61+ },
62+--
63+2.1.4
64+
65
66=== modified file 'debian/patches/series'
67--- debian/patches/series 2015-04-10 18:17:03 +0000
68+++ debian/patches/series 2015-08-04 13:54:43 +0000
69@@ -1,2 +1,3 @@
70 sql_conn.patch
71 fix-requirements.patch
72+0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch

Subscribers

People subscribed via source and target branches