summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-06-23 06:33:25 -0700
committerChris Behrens <cbehrens@codestud.com>2011-06-23 06:33:25 -0700
commit07404e266a4a6b690c62624a9a5e47d60cab7d5b (patch)
treef67d23e86c61dd63daaf53866968c66c3789d111 /nova/api
parent1aa7e746d5918f2a664da1937183b66fe31f6bd4 (diff)
fixes for recurse_zones and None instances with compute's get_all
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8c93ce230..9e861359a 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -81,8 +81,7 @@ class Controller(object):
project_id = query_str.get('project_id')
fixed_ip = query_str.get('fixed_ip')
recurse_zones = query_str.get('recurse_zones')
- if recurse_zones is not None:
- recurse_zones = True
+ recurse_zones = recurse_zones and True or False
instance_list = self.compute_api.get_all(
req.environ['nova.context'],
reservation_id=reservation_id,