Merge "Make gnocchi as default datasource"

watcher/decision_engine/strategy/strategies/basic_consolidation.py

@@ -158,7 +158,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy):
             cfg.StrOpt(
                 "datasource",
                 help="Data source to use in order to query the needed metrics",
-                default="ceilometer",
+                default="gnocchi",
                 choices=["ceilometer", "monasca", "gnocchi"]),
             cfg.BoolOpt(
                 "check_optimize_metadata",

watcher/decision_engine/strategy/strategies/outlet_temp_control.py

@@ -167,7 +167,7 @@ class OutletTempControl(base.ThermalOptimizationBaseStrategy):
             cfg.StrOpt(
                 "datasource",
                 help="Data source to use in order to query the needed metrics",
-                default="ceilometer",
+                default="gnocchi",
                 choices=["ceilometer", "gnocchi"])
         ]
 

watcher/decision_engine/strategy/strategies/uniform_airflow.py

@@ -210,7 +210,7 @@ class UniformAirflow(base.BaseStrategy):
             cfg.StrOpt(
                 "datasource",
                 help="Data source to use in order to query the needed metrics",
-                default="ceilometer",
+                default="gnocchi",
                 choices=["ceilometer", "gnocchi"])
         ]
 

watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py

@@ -165,7 +165,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
             cfg.StrOpt(
                 "datasource",
                 help="Data source to use in order to query the needed metrics",
-                default="ceilometer",
+                default="gnocchi",
                 choices=["ceilometer", "gnocchi"])
         ]
 

watcher/decision_engine/strategy/strategies/workload_balance.py

@@ -187,7 +187,7 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
             cfg.StrOpt(
                 "datasource",
                 help="Data source to use in order to query the needed metrics",
-                default="ceilometer",
+                default="gnocchi",
                 choices=["ceilometer", "gnocchi"])
         ]
 

watcher/decision_engine/strategy/strategies/workload_stabilization.py

@@ -172,7 +172,7 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
             cfg.StrOpt(
                 "datasource",
                 help="Data source to use in order to query the needed metrics",
-                default="ceilometer",
+                default="gnocchi",
                 choices=["ceilometer", "gnocchi"])
         ]