From f14795d29fdf049ae06d4119c27f93d444e66564 Mon Sep 17 00:00:00 2001 From: Alexander Chadin Date: Thu, 30 Nov 2017 13:05:03 +0300 Subject: [PATCH] Make gnocchi as default datasource This patch set follows deprecation steps and changes default datasource to gnocchi Closes-Bug: #1735180 Change-Id: I3b7ec47af7707359373a424a6469d28cbf9ce177 --- .../decision_engine/strategy/strategies/basic_consolidation.py | 2 +- .../decision_engine/strategy/strategies/outlet_temp_control.py | 2 +- watcher/decision_engine/strategy/strategies/uniform_airflow.py | 2 +- .../strategy/strategies/vm_workload_consolidation.py | 2 +- watcher/decision_engine/strategy/strategies/workload_balance.py | 2 +- .../strategy/strategies/workload_stabilization.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/watcher/decision_engine/strategy/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/strategies/basic_consolidation.py index 9fef5baed..32033cacb 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/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", diff --git a/watcher/decision_engine/strategy/strategies/outlet_temp_control.py b/watcher/decision_engine/strategy/strategies/outlet_temp_control.py index 0aba274a0..80d8d4018 100644 --- a/watcher/decision_engine/strategy/strategies/outlet_temp_control.py +++ b/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"]) ] diff --git a/watcher/decision_engine/strategy/strategies/uniform_airflow.py b/watcher/decision_engine/strategy/strategies/uniform_airflow.py index 8a764dfc2..2ee5cc3a9 100644 --- a/watcher/decision_engine/strategy/strategies/uniform_airflow.py +++ b/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"]) ] diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py index ab0e717fa..6465a14b3 100644 --- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py +++ b/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"]) ] diff --git a/watcher/decision_engine/strategy/strategies/workload_balance.py b/watcher/decision_engine/strategy/strategies/workload_balance.py index a5cb3ccbd..8b313faac 100644 --- a/watcher/decision_engine/strategy/strategies/workload_balance.py +++ b/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"]) ] diff --git a/watcher/decision_engine/strategy/strategies/workload_stabilization.py b/watcher/decision_engine/strategy/strategies/workload_stabilization.py index db094f568..20356a55e 100644 --- a/watcher/decision_engine/strategy/strategies/workload_stabilization.py +++ b/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"]) ]