summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorBilal Akhtar <bilalakhtar@ubuntu.com>2011-02-10 10:39:29 +0000
committerTarmac <>2011-02-10 10:39:29 +0000
commit5e66cf492f150bfbd01e5983d876192c5b158343 (patch)
tree6721073c8eac2dc3f900c05006c8b319ccd9ad80 /nova
parent10626fc89e0f842b095b7c5864bb91e762984fbc (diff)
parent216822bdda290f964020134599749ebbadc76566 (diff)
downloadnova-5e66cf492f150bfbd01e5983d876192c5b158343.tar.gz
nova-5e66cf492f150bfbd01e5983d876192c5b158343.tar.xz
nova-5e66cf492f150bfbd01e5983d876192c5b158343.zip
This branch fixes bug #708347: RunInstances: Invalid instance type gives improper error message
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/instance_types.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 196d6a8df..309313fd0 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -38,8 +38,8 @@ def get_by_type(instance_type):
if instance_type is None:
return FLAGS.default_instance_type
if instance_type not in INSTANCE_TYPES:
- raise exception.ApiError(_("Unknown instance type: %s"),
- instance_type)
+ raise exception.ApiError(_("Unknown instance type: %s") % \
+ instance_type, "Invalid")
return instance_type