diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-02 19:36:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-02 19:36:39 +0000 |
| commit | 040139ec338ea34e2d3bd526d8072cb3a8335650 (patch) | |
| tree | 619e368fddaa100cb641761aecc1eac507ea5847 /nova/api | |
| parent | 54dc193e413a6c258e390bc3bcca714aa5015efe (diff) | |
| parent | 057138540df2b067bd3cd2857cceb97d1ecd86d0 (diff) | |
| download | nova-040139ec338ea34e2d3bd526d8072cb3a8335650.tar.gz nova-040139ec338ea34e2d3bd526d8072cb3a8335650.tar.xz nova-040139ec338ea34e2d3bd526d8072cb3a8335650.zip | |
Merge "APIs should not wait on scheduler for builds in single zone deployment"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 5 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 16ea74025..b2aa120e6 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1437,10 +1437,7 @@ class CloudController(object): security_group=kwargs.get('security_group'), availability_zone=kwargs.get('placement', {}).get( 'AvailabilityZone'), - block_device_mapping=kwargs.get('block_device_mapping', {}), - # NOTE(comstud): Unfortunately, EC2 requires that the - # instance DB entries have been created.. - wait_for_instances=True) + block_device_mapping=kwargs.get('block_device_mapping', {})) return self._format_run_instances(context, resv_id) def _do_instance(self, action, context, ec2_id): diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 8c1eaae9d..b71e5df31 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -462,8 +462,7 @@ class Controller(object): user_data=user_data, availability_zone=availability_zone, config_drive=config_drive, - block_device_mapping=block_device_mapping, - wait_for_instances=not ret_resv_id) + block_device_mapping=block_device_mapping) except quota.QuotaError as error: self._handle_quota_error(error) except exception.InstanceTypeMemoryTooSmall as error: |