openstack
/
cloudkitty
Code Issues Proposed changes

Use Keystone v3 API by default in fetcher 

The Keystone v2.0 API was removed in Queens.

Change-Id: Ib081156139d942a465fd9051c5a9a680ed38da55
This commit is contained in:
Pierre Riteau 2020-02-04 16:59:45 +01:00
parent 25149441fb
commit 48719c53be
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudkitty/fetcher/keystone.py
View File

@ -28,7 +28,7 @@ FETCHER_KEYSTONE_OPTS = 'fetcher_keystone'
fetcher_keystone_opts = [ fetcher_keystone_opts = [
cfg.StrOpt( cfg.StrOpt(
'keystone_version', 'keystone_version',
default='2', default='3',
help='Keystone version to use.', help='Keystone version to use.',
), ),
] ]

2
doc/source/_static/cloudkitty.conf.sample
View File

@ -513,7 +513,7 @@
# #
# Keystone version to use. (string value) # Keystone version to use. (string value)
#keystone_version = 2 #keystone_version = 3
[fetcher_prometheus] [fetcher_prometheus]

2
doc/source/admin/configuration/fetcher.rst
View File

@ -49,7 +49,7 @@ Keystone
Section ``fetcher_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 * ``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 options declared in the target section will be used in order to fetch scopes