summaryrefslogtreecommitdiff
path: root/ceilometer/network
diff options
context:
space:
mode:
authorMehdi Abaakouk <sileht@redhat.com>2015-09-28 09:02:25 +0200
committerMehdi Abaakouk <sileht@redhat.com>2015-12-08 15:45:08 +0100
commit51a6096a85bf66e918f5981546841e73e038bceb (patch)
tree9e530886aae8057af21eaac74e9fc53016c2c3e2 /ceilometer/network
parent6751acb767ef0fe31d4ee2643cc4c327abcf8abd (diff)
downloadceilometer-51a6096a85bf66e918f5981546841e73e038bceb.tar.gz
Use keystoneauth1 instead of manual setup
This change moves our code to the new keystoneauth1 library. This allows to wipe out all authentification code from Ceilometer. Ceilometer become compatible with all keystone API version and all keystone auth plugin for authentification. This also moves the keystone project discovery to v3 API, to fully removes the keystone v2 client from Ceilometer. Implements blueprint support-keystone-v3 Depends-On: Ia5e924eb58aac7fd53e9fe4a3dbdee102ece3ad7 Depends-On: Ic7bbf9c98eb3f5a5d31da6f313458c4c4d62f59f Change-Id: Id2938c2b323e935b3da35768f1f75ea3ae65bad5
Diffstat (limited to 'ceilometer/network')
-rw-r--r--ceilometer/network/floatingip.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py
index 37df3031..7258cf59 100644
--- a/ceilometer/network/floatingip.py
+++ b/ceilometer/network/floatingip.py
@@ -34,7 +34,8 @@ class FloatingIPPollster(plugin_base.PollsterBase):
@staticmethod
def _get_floating_ips(ksclient, endpoint):
nv = nova_client.Client(
- auth_token=ksclient.auth_token, bypass_url=endpoint)
+ auth=ksclient.session.auth,
+ endpoint_override=endpoint)
return nv.floating_ip_get_all()
def _iter_floating_ips(self, ksclient, cache, endpoint):