From 48719c53be4a0850dd3e6e2b14066999bb3341dc Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 4 Feb 2020 16:59:45 +0100
Subject: [PATCH] Use Keystone v3 API by default in fetcher

The Keystone v2.0 API was removed in Queens.

Change-Id: Ib081156139d942a465fd9051c5a9a680ed38da55
---
 cloudkitty/fetcher/keystone.py             | 2 +-
 doc/source/_static/cloudkitty.conf.sample  | 2 +-
 doc/source/admin/configuration/fetcher.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloudkitty/fetcher/keystone.py b/cloudkitty/fetcher/keystone.py
index 91c2fc9c..fb439104 100644
--- a/cloudkitty/fetcher/keystone.py
+++ b/cloudkitty/fetcher/keystone.py
@@ -28,7 +28,7 @@ FETCHER_KEYSTONE_OPTS = 'fetcher_keystone'
 fetcher_keystone_opts = [
     cfg.StrOpt(
         'keystone_version',
-        default='2',
+        default='3',
         help='Keystone version to use.',
     ),
 ]
diff --git a/doc/source/_static/cloudkitty.conf.sample b/doc/source/_static/cloudkitty.conf.sample
index 8c0a67c8..3d43849b 100644
--- a/doc/source/_static/cloudkitty.conf.sample
+++ b/doc/source/_static/cloudkitty.conf.sample
@@ -513,7 +513,7 @@
 #
 
 # Keystone version to use. (string value)
-#keystone_version = 2
+#keystone_version = 3
 
 
 [fetcher_prometheus]
diff --git a/doc/source/admin/configuration/fetcher.rst b/doc/source/admin/configuration/fetcher.rst
index fa5b4ee0..df286dff 100644
--- a/doc/source/admin/configuration/fetcher.rst
+++ b/doc/source/admin/configuration/fetcher.rst
@@ -49,7 +49,7 @@ Keystone
 
 Section ``fetcher_keystone``.
 
-* ``keystone_version``: Defaults to ``2``. Keystone version to use.
+* ``keystone_version``: Defaults to ``3``. Keystone version to use.
 
 * ``auth_section``: If the ``auth_section`` option is defined then all the
   options declared in the target section will be used in order to fetch scopes