Merge "Add more verbosity for gnocchi_resources.yaml"

ceilometer/declarative.py

@@ -151,7 +151,7 @@ def load_definitions(conf, defaults, config_file, fallback_file=None):
     if not os.path.exists(config_file):
         config_file = conf.find_file(config_file)
     if not config_file and fallback_file is not None:
-        LOG.debug("No Definitions configuration file found!"
+        LOG.debug("No Definitions configuration file found! "
                   "Using default config.")
         config_file = fallback_file
 
@@ -179,7 +179,7 @@ def load_definitions(conf, defaults, config_file, fallback_file=None):
             raise
 
     else:
-        LOG.debug("No Definitions configuration file found!"
+        LOG.debug("No Definitions configuration file found! "
                   "Using default config.")
         definition_cfg = defaults
 

ceilometer/dispatcher/gnocchi.py

@@ -16,6 +16,7 @@ from collections import defaultdict
 import hashlib
 import itertools
 import operator
+import pkg_resources
 import re
 import threading
 import uuid
@@ -252,7 +253,9 @@ class GnocchiDispatcher(dispatcher.MeterDispatcherBase,
         plugin_manager = extension.ExtensionManager(
             namespace='ceilometer.event.trait_plugin')
         data = declarative.load_definitions(
-            conf, {}, conf.dispatcher_gnocchi.resources_definition_file)
+            conf, {}, conf.dispatcher_gnocchi.resources_definition_file,
+            pkg_resources.resource_filename(__name__,
+                                            "data/gnocchi_resources.yaml"))
         resource_defs = []
         for resource in data.get('resources', []):
             try:

devstack/plugin.sh

@@ -300,8 +300,7 @@ function configure_ceilometer {
     # ceilometer.conf settings that have already been made.
     # Anyway, explicit is better than implicit.
     for conffile in policy.json api_paste.ini pipeline.yaml \
-                    event_definitions.yaml event_pipeline.yaml \
-                    gnocchi_resources.yaml; do
+                    event_definitions.yaml event_pipeline.yaml; do
         cp $CEILOMETER_DIR/etc/ceilometer/$conffile $CEILOMETER_CONF_DIR
     done