Merge "Allow gnocchi collector to be used outside of OpenStack"

cloudkitty/collector/gnocchi.py

@@ -15,6 +15,7 @@
 #
 import decimal
 
+from gnocchiclient import auth as gauth
 from gnocchiclient import client as gclient
 from keystoneauth1 import loading as ks_loading
 from oslo_config import cfg
@@ -28,12 +29,33 @@ LOG = logging.getLogger(__name__)
 
 GNOCCHI_COLLECTOR_OPTS = 'gnocchi_collector'
 gnocchi_collector_opts = ks_loading.get_auth_common_conf_options()
-end_point_type_opts = [
+gcollector_opts = [
-    cfg.StrOpt('interface',
+    cfg.StrOpt(
-               default='internalURL',
+        'gnocchi_auth_type',
-               help='endpoint url type'), ]
+        default='keystone',
+        choices=['keystone', 'basic'],
+        help='Gnocchi auth type (keystone or basic). Keystone credentials '
+        'can be specified through the "auth_section" parameter',
+    ),
+    cfg.StrOpt(
+        'gnocchi_user',
+        default='',
+        help='Gnocchi user (for basic auth only)',
+    ),
+    cfg.StrOpt(
+        'gnocchi_endpoint',
+        default='',
+        help='Gnocchi endpoint (for basic auth only)',
+    ),
+    cfg.StrOpt(
+        'interface',
+        default='internalURL',
+        help='Endpoint URL type (for keystone auth only)',
+    ),
+]
+
 cfg.CONF.register_opts(gnocchi_collector_opts, GNOCCHI_COLLECTOR_OPTS)
-cfg.CONF.register_opts(end_point_type_opts, GNOCCHI_COLLECTOR_OPTS)
+cfg.CONF.register_opts(gcollector_opts, GNOCCHI_COLLECTOR_OPTS)
 ks_loading.register_session_conf_options(
     cfg.CONF,
     GNOCCHI_COLLECTOR_OPTS)
@@ -54,18 +76,23 @@ class GnocchiCollector(collector.BaseCollector):
         self.t_gnocchi = self.transformers['GnocchiTransformer']
         self.t_cloudkitty = self.transformers['CloudKittyFormatTransformer']
 
-        self.auth = ks_loading.load_auth_from_conf_options(
+        adapter_options = {'connect_retries': 3}
-            CONF,
+        if CONF.gnocchi_collector.gnocchi_auth_type == 'keystone':
-            GNOCCHI_COLLECTOR_OPTS)
+            auth_plugin = ks_loading.load_auth_from_conf_options(
-        self.session = ks_loading.load_session_from_conf_options(
+                CONF,
-            CONF,
+                'gnocchi_collector',
-            GNOCCHI_COLLECTOR_OPTS,
+            )
-            auth=self.auth)
+            adapter_options['interface'] = CONF.gnocchi_collector.interface
+        else:
+            auth_plugin = gauth.GnocchiBasicPlugin(
+                user=CONF.gnocchi_collector.gnocchi_user,
+                endpoint=CONF.gnocchi_collector.gnocchi_endpoint,
+            )
         self._conn = gclient.Client(
             '1',
-            session=self.session,
+            session_options={'auth': auth_plugin},
-            adapter_options={'connect_retries': 3,
+            adapter_options=adapter_options,
-                             'interface': CONF.gnocchi_collector.interface})
+        )
 
     @classmethod
     def get_metadata(cls, resource_name, transformers, conf):

cloudkitty/common/config.py

@@ -38,7 +38,7 @@ _opts = [
     ('collector_monasca', list(itertools.chain(
         cloudkitty.collector.monasca.collector_monasca_opts))),
     ('gnocchi_collector', list(itertools.chain(
-        cloudkitty.collector.gnocchi.end_point_type_opts,
+        cloudkitty.collector.gnocchi.gcollector_opts,
         cloudkitty.collector.gnocchi.gnocchi_collector_opts))),
     ('keystone_fetcher', list(itertools.chain(
         cloudkitty.fetcher.keystone.keystone_fetcher_opts,