consolidation of watcher

Change-Id: I9c82ef4d8a81af98afdfc34f5ad496bcade4af6a
2015-10-22 17:02:45 +02:00
parent 8c76c7fbef
commit 74160c5e78
140 changed files with 2991 additions and 1271 deletions
--- a/watcher/cmd/decisionengine.py
+++ b/watcher/cmd/decisionengine.py
@@ -27,7 +27,10 @@ from watcher.decision_engine.framework.manager_decision_engine import \
    DecisionEngineManager
 from watcher.openstack.common._i18n import _LI
 from watcher.openstack.common import log as logging
-
+cfg.CONF.import_opt('hostname',
+                    'watcher.metrics_engine.framework.'
+                    'datasources.influxdb_collector',
+                    group='watcher_influxdb_collector')

 LOG = logging.getLogger(__name__)