← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/compute/instance_types.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/instance_types.py
38
38
    if instance_type is None:
39
39
        return FLAGS.default_instance_type
40
40
    if instance_type not in INSTANCE_TYPES:
41
 
        raise exception.ApiError("Unknown instance type: %s" % instance_type)
 
41
        raise exception.ApiError(_("Unknown instance type: %s"),
 
42
                                 instance_type)
42
43
    return instance_type
43
44
 
44
45