summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2012-06-08 15:18:13 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2012-06-08 15:43:12 -0400
commit5157401f20158b2b99d01796f73a8ba5368c80a2 (patch)
treef23161fa52fbefa742e6cae6a7cc11578df642ba /nova/api
parente3911801f6814ebc8aeed1e6b4284fbfb2e74192 (diff)
downloadnova-5157401f20158b2b99d01796f73a8ba5368c80a2.tar.gz
nova-5157401f20158b2b99d01796f73a8ba5368c80a2.tar.xz
nova-5157401f20158b2b99d01796f73a8ba5368c80a2.zip
Do not always query deleted instance_types.
When converting from flavorid to instance_type_id in the OSAPI, it isn't always desired to return deleted instance_types. In the case of OSAPI create(), we explicitly do not want to query deleted flavors. Fixes bug 1010638 Change-Id: I9c26c7130f8c3d6680143e36b4aaa1f662c682a7
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py2
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,