← Back to branch summary

~cbehrens/nova/rpc-kombu

« back to all changes in this revision

Viewing changes to nova/compute/api.py

  • Committer: Mark Washenberger
  • Date: 2011-03-15 18:19:47 UTC
  • mfrom: (806 nova)
  • mto: This revision was merged to the branch mainline in revision 814.
  • Revision ID: mark.washenberger@rackspace.com-20110315181947-no5rfi12g7fa75sm
merge lp:nova

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/api.py
146
146
            onset_files = self._check_onset_file_quota(context, onset_files)
147
147
 
148
148
        image = self.image_service.show(context, image_id)
 
149
 
 
150
        os_type = None
 
151
        if 'properties' in image and 'os_type' in image['properties']:
 
152
            os_type = image['properties']['os_type']
 
153
 
149
154
        if kernel_id is None:
150
155
            kernel_id = image['properties'].get('kernel_id', None)
151
156
        if ramdisk_id is None:
202
207
            'key_data': key_data,
203
208
            'locked': False,
204
209
            'metadata': metadata,
205
 
            'availability_zone': availability_zone}
 
210
            'availability_zone': availability_zone,
 
211
            'os_type': os_type}
206
212
        elevated = context.elevated()
207
213
        instances = []
208
214
        LOG.debug(_("Going to run %s instances..."), num_instances)