~markmc/nova/flat-dhcp-without-bridge-iface

« back to all changes in this revision

Viewing changes to nova/scheduler/abstract_scheduler.py

  • Committer: Tarmac
  • Author(s): Ed Leafe
  • Date: 2011-08-19 18:37:39 UTC
  • mfrom: (1452.2.4 lp828848)
  • Revision ID: tarmac-20110819183739-yar3yr2qoq96oscy
Removes the incorrect hard-coded filter path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
        host = build_plan_item['hostname']
63
63
        base_options = request_spec['instance_properties']
64
64
        image = request_spec['image']
 
65
        instance_type = request_spec.get('instance_type')
65
66
 
66
67
        # TODO(sandy): I guess someone needs to add block_device_mapping
67
68
        # support at some point? Also, OS API has no concept of security
68
69
        # groups.
69
70
        instance = compute_api.API().create_db_entry_for_new_instance(context,
70
 
                image, base_options, None, [])
 
71
                instance_type, image, base_options, None, [])
71
72
 
72
73
        instance_id = instance['id']
73
74
        kwargs['instance_id'] = instance_id