diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-12-14 04:25:39 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-12-14 04:25:39 -0400 |
| commit | 90190eb3b4d285cab2e8884045f361ea9441a84a (patch) | |
| tree | 259e4d8e73a2bd3cf708ed5cb5a7ab9f45a46f41 /nova/compute | |
| parent | 99ba9bc7c4cd7bdb085e76a8f926ade27d558a84 (diff) | |
| parent | 911f11139926a772a5d90b8ec65cc4cb7ad850e9 (diff) | |
fixup after merge with trunk
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 |