From cdcf2cbf5812f6f74a19ba98e67be155864a0701 Mon Sep 17 00:00:00 2001
From: Yves-Gwenael Bourhis <yves-gwenael.bourhis@cloudwatt.com>
Date: Thu, 5 Nov 2015 17:49:16 +0100
Subject: [PATCH] Not sending auth-url to ceilometerclient

If ceilometerclient gets an auth-url, it tries some keystone
requests with the publicURL even if endpoint_type is 'internalURL'.

We force the endpoint-type and region name without providing auth-url.

Closes-Bug: #1513544

Change-Id: Ib214f9d25f32f7cd1f06c27d73a889ce032915e0
---
 ospurge/client.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ospurge/client.py b/ospurge/client.py
index 4ea6859..e114cd5 100755
--- a/ospurge/client.py
+++ b/ospurge/client.py
@@ -518,8 +518,9 @@ class CeilometerAlarms(base.Resources):
         def get_token():
             return session.token
         self.client = ceilometer_client.Client(
-            auth_url=session.auth_url,
             endpoint=session.get_endpoint("metering"),
+            endpoint_type=session.endpoint_type,
+            region_name=session.region_name,
             token=get_token, insecure=session.insecure)
         self.project_id = session.project_id