Merge "Change 'zone_blob' key to 'blob' in create server. bug 893183"

This commit is contained in:
Jenkins 2011-11-28 20:00:17 +00:00 committed by Gerrit Code Review
commit 674c63e99d
4 changed files with 4 additions and 3 deletions

@ -10,6 +10,7 @@ Christopher MacGown <ignoti+github@gmail.com>
Dan Wendlandt <dan@nicira.com> Dan Wendlandt <dan@nicira.com>
Dean Troyer <dtroyer@gmail.com> Dean Troyer <dtroyer@gmail.com>
Ed Leafe <ed@leafe.com> Ed Leafe <ed@leafe.com>
Edouard Thuleau <edouard1.thuleau@orange.com>
Eldar Nugaev <eldr@ya.ru> Eldar Nugaev <eldr@ya.ru>
Gabriel Hurley <gabriel@strikeawe.com> Gabriel Hurley <gabriel@strikeawe.com>
Gaurav Gupta <gaurav@denali-systems.com> Gaurav Gupta <gaurav@denali-systems.com>

@ -208,7 +208,7 @@ class BootingManagerWithFind(ManagerWithFind):
if reservation_id: if reservation_id:
body["server"]["reservation_id"] = reservation_id body["server"]["reservation_id"] = reservation_id
if zone_blob: if zone_blob:
body["server"]["zone_blob"] = zone_blob body["server"]["blob"] = zone_blob
if not min_count: if not min_count:
min_count = 1 min_count = 1

@ -71,7 +71,7 @@ class BootingManagerWithFind(base.ManagerWithFind):
if reservation_id: if reservation_id:
body["server"]["reservation_id"] = reservation_id body["server"]["reservation_id"] = reservation_id
if zone_blob: if zone_blob:
body["server"]["zone_blob"] = zone_blob body["server"]["blob"] = zone_blob
if not min_count: if not min_count:
min_count = 1 min_count = 1

@ -71,7 +71,7 @@ class BootingManagerWithFind(base.ManagerWithFind):
if reservation_id: if reservation_id:
body["server"]["reservation_id"] = reservation_id body["server"]["reservation_id"] = reservation_id
if zone_blob: if zone_blob:
body["server"]["zone_blob"] = zone_blob body["server"]["blob"] = zone_blob
if key_name: if key_name:
body["server"]["key_name"] = key_name body["server"]["key_name"] = key_name