diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-10 20:56:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-10 20:56:47 +0000 |
| commit | 3ea7dcc6432d6247cb1dc536c31684b595841633 (patch) | |
| tree | a04b9d191ac15ce1c183dbc870768896c31ffbe9 /nova/api | |
| parent | c3a12e6eafc4563ef44101629f1f4363c9cefdab (diff) | |
| parent | 5157401f20158b2b99d01796f73a8ba5368c80a2 (diff) | |
| download | nova-3ea7dcc6432d6247cb1dc536c31684b595841633.tar.gz nova-3ea7dcc6432d6247cb1dc536c31684b595841633.tar.xz nova-3ea7dcc6432d6247cb1dc536c31684b595841633.zip | |
Merge "Do not always query deleted instance_types."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 64af7222f..a92d9b6bb 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -676,7 +676,7 @@ class Controller(wsgi.Controller): try: _get_inst_type = instance_types.get_instance_type_by_flavor_id - inst_type = _get_inst_type(flavor_id) + inst_type = _get_inst_type(flavor_id, read_deleted="no") (instances, resv_id) = self.compute_api.create(context, inst_type, |