summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-12 10:43:18 +0000
committerGerrit Code Review <review@openstack.org>2014-06-12 10:43:18 +0000
commit5aa5cfd5bc489d148967b9767cecda740846e0ec (patch)
tree4f695274f031fb6edaaf62ee89f267a314820064
parent1c4f604f96146ac052d7454e61550e891c07c91f (diff)
parente7bd5eb0d401903944bb9ca3fa60e4874e3ad7a4 (diff)
downloadceilometer-5aa5cfd5bc489d148967b9767cecda740846e0ec.tar.gz
Merge "Revert "Fix the floatingip pollster""2014.2.b1
-rw-r--r--ceilometer/nova_client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py
index 83595024..092695e8 100644
--- a/ceilometer/nova_client.py
+++ b/ceilometer/nova_client.py
@@ -116,4 +116,4 @@ class Client(object):
@logged
def floating_ip_get_all(self):
"""Returns all floating ips."""
- return self.nova_client.floating_ips.list(all_tenants=True)
+ return self.nova_client.floating_ips.list()