From 72c5ca3aeca8782def98d9254b73a44be80c8b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89douard=20Thuleau?= <edouard1.thuleau@orange.com>
Date: Tue, 22 Nov 2011 10:20:49 +0100
Subject: [PATCH] Change 'zone_blob' key to 'blob' in create server. bug 893183
The OSAPI looks for key 'blob' to check if a build plan
is associated to a create request server. But the
novaclient uses the key 'zone_blob'.
Change-Id: I85fd3629e1b3a2f142ac9296418e361aff5c5e4b
---
AUTHORS | 1 +
novaclient/base.py | 2 +-
novaclient/v1_0/base.py | 2 +-
novaclient/v1_1/base.py | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 8d93b7a7c..b82649f6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Christopher MacGown <ignoti+github@gmail.com>
Dan Wendlandt <dan@nicira.com>
Dean Troyer <dtroyer@gmail.com>
Ed Leafe <ed@leafe.com>
+Edouard Thuleau <edouard1.thuleau@orange.com>
Eldar Nugaev <eldr@ya.ru>
Gabriel Hurley <gabriel@strikeawe.com>
Gaurav Gupta <gaurav@denali-systems.com>
diff --git a/novaclient/base.py b/novaclient/base.py
index b2c9a84d5..396456c10 100644
--- a/novaclient/base.py
+++ b/novaclient/base.py
@@ -171,7 +171,7 @@ class BootingManagerWithFind(ManagerWithFind):
if reservation_id:
body["server"]["reservation_id"] = reservation_id
if zone_blob:
- body["server"]["zone_blob"] = zone_blob
+ body["server"]["blob"] = zone_blob
if not min_count:
min_count = 1
diff --git a/novaclient/v1_0/base.py b/novaclient/v1_0/base.py
index 3ff7ac2d6..5c09e9d99 100644
--- a/novaclient/v1_0/base.py
+++ b/novaclient/v1_0/base.py
@@ -71,7 +71,7 @@ class BootingManagerWithFind(base.ManagerWithFind):
if reservation_id:
body["server"]["reservation_id"] = reservation_id
if zone_blob:
- body["server"]["zone_blob"] = zone_blob
+ body["server"]["blob"] = zone_blob
if not min_count:
min_count = 1
diff --git a/novaclient/v1_1/base.py b/novaclient/v1_1/base.py
index ba5682768..7c326c7f1 100644
--- a/novaclient/v1_1/base.py
+++ b/novaclient/v1_1/base.py
@@ -71,7 +71,7 @@ class BootingManagerWithFind(base.ManagerWithFind):
if reservation_id:
body["server"]["reservation_id"] = reservation_id
if zone_blob:
- body["server"]["zone_blob"] = zone_blob
+ body["server"]["blob"] = zone_blob
if key_name:
body["server"]["key_name"] = key_name