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

1 files changed, 5 insertions, 16 deletions

diff --git a/ceilometer/neutron_client.py b/ceilometer/neutron_client.py
index 5e8f5d7b..4dfb92e6 100644
--- a/ceilometer/neutron_client.py
+++ b/ceilometer/neutron_client.py
@@ -19,6 +19,7 @@ from neutronclient.v2_0 import client as clientv20
 from oslo_config import cfg
 from oslo_log import log
 
+from ceilometer import keystone_client
 
 SERVICE_OPTS = [
     cfg.StrOpt('neutron',
@@ -27,8 +28,7 @@ SERVICE_OPTS = [
 ]
 
 cfg.CONF.register_opts(SERVICE_OPTS, group='service_types')
-cfg.CONF.import_opt('http_timeout', 'ceilometer.service')
-cfg.CONF.import_group('service_credentials', 'ceilometer.service')
+cfg.CONF.import_group('service_credentials', 'ceilometer.keystone_client')
 
 LOG = log.getLogger(__name__)
 
@@ -58,22 +58,11 @@ class Client(object):
     def __init__(self):
         conf = cfg.CONF.service_credentials
         params = {
-            'insecure': conf.insecure,
-            'ca_cert': conf.os_cacert,
-            'username': conf.os_username,
-            'password': conf.os_password,
-            'auth_url': conf.os_auth_url,
-            'region_name': conf.os_region_name,
-            'endpoint_type': conf.os_endpoint_type,
-            'timeout': cfg.CONF.http_timeout,
+            'session': keystone_client.get_session(),
+            'endpoint_type': conf.interface,
+            'region_name': conf.region_name,
             'service_type': cfg.CONF.service_types.neutron,
         }
-
-        if conf.os_tenant_id:
-            params['tenant_id'] = conf.os_tenant_id
-        else:
-            params['tenant_name'] = conf.os_tenant_name
-
         self.client = clientv20.Client(**params)
 
     @logged