← Back to branch summary

~mdragon/nova/multi-tenant-accounting

« back to all changes in this revision

Viewing changes to nova/compute/api.py

  • Committer: Monsyne Dragon
  • Date: 2011-03-03 15:50:34 UTC
  • mfrom: (752.2.6 nova)
  • Revision ID: mdragon@rackspace.com-20110303155034-seiumq0o74hynh6i
Remerged trunk, fixed a few conflicts. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/api.py
88
88
               availability_zone=None, user_data=None, metadata=[],
89
89
               onset_files=None):
90
90
        """Create the number of instances requested if quota and
91
 
        other arguments check out ok.
92
 
        """
93
 
        type_data = instance_types.INSTANCE_TYPES[instance_type]
 
91
        other arguments check out ok."""
 
92
 
 
93
        type_data = instance_types.get_instance_type(instance_type)
94
94
        num_instances = quota.allowed_instances(context, max_count, type_data)
95
95
        if num_instances < min_count:
96
96
            pid = context.project_id