From 3ed9ed1a0f03dbcc6cad9b3e21664e2380dad62a Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 5 Sep 2017 16:40:06 +0200
Subject: [PATCH] Use gnocchiclient 4.0 exception types

It does not raise keystoneauth1 exceptions anymore.

Change-Id: I3c544911e63f2ef25ed1c0e7154de054dde02606
---
 ceilometer/dispatcher/gnocchi.py | 3 +--
 setup.cfg                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ceilometer/dispatcher/gnocchi.py b/ceilometer/dispatcher/gnocchi.py
index c49a527ccd..8a646584e3 100644
--- a/ceilometer/dispatcher/gnocchi.py
+++ b/ceilometer/dispatcher/gnocchi.py
@@ -351,8 +351,7 @@ class GnocchiDispatcher(dispatcher.MeterDispatcherBase,
 
         try:
             self.batch_measures(measures, gnocchi_data, stats)
-        except (gnocchi_exc.ClientException,
-                ka_exceptions.ConnectFailure) as e:
+        except gnocchi_exc.ClientException as e:
             LOG.error(six.text_type(e))
         except Exception as e:
             LOG.error(six.text_type(e), exc_info=True)
diff --git a/setup.cfg b/setup.cfg
index 09fd169bb0..eccce140c1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ data_files =
 
 [extras]
 gnocchi =
-    gnocchiclient>=3.1.0 # Apache-2.0
+    gnocchiclient>=4.0.0 # Apache-2.0
 mongo =
     pymongo!=3.1,>=3.0.2 # Apache-2.0
 postgresql =