diff options
| author | termie <code@term.ie> | 2010-12-14 17:06:56 -0800 |
|---|---|---|
| committer | termie <code@term.ie> | 2010-12-14 17:06:56 -0800 |
| commit | e9a9a4e48ff40b4b1c8233a7c7aaa9ad77af2cee (patch) | |
| tree | 2a04066d38942874eaa263e4c4a2437f22e34c37 /nova/compute | |
| parent | a2a8406b5d793545c8ecb359e18b80bba618c509 (diff) | |
| parent | 87265fd2de6b73a32bd327553ce542ee5ec125b3 (diff) | |
| download | nova-e9a9a4e48ff40b4b1c8233a7c7aaa9ad77af2cee.tar.gz nova-e9a9a4e48ff40b4b1c8233a7c7aaa9ad77af2cee.tar.xz nova-e9a9a4e48ff40b4b1c8233a7c7aaa9ad77af2cee.zip | |
merged upstream
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/instance_types.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index a2679e0fc..6e47170bd 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -22,6 +22,7 @@ The built-in instance properties. """ from nova import flags +from nova import exception FLAGS = flags.FLAGS INSTANCE_TYPES = { @@ -37,8 +38,7 @@ 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) return instance_type |