From 5f6a97148fa5aa745dec83fcdeeec8b2ff38216d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fran=C3=A7oise?= Date: Fri, 15 Apr 2016 16:55:00 +0200 Subject: [PATCH] Remove [watcher_goals] config section In this changeset, I remove the now unused [watcher_goals] section. Partially Implements: blueprint get-goal-from-strategy Change-Id: I91e4e1ac3a58bb6f3e30b11449cf1a6eb18cd0ca --- .../strategy/selection/default.py | 16 ---------------- watcher/opts.py | 3 --- 2 files changed, 19 deletions(-) diff --git a/watcher/decision_engine/strategy/selection/default.py b/watcher/decision_engine/strategy/selection/default.py index bb21d30a3..213789482 100644 --- a/watcher/decision_engine/strategy/selection/default.py +++ b/watcher/decision_engine/strategy/selection/default.py @@ -25,22 +25,6 @@ from watcher.decision_engine.strategy.selection import base LOG = log.getLogger(__name__) CONF = cfg.CONF -default_goals = {'DUMMY': 'dummy'} - -WATCHER_GOALS_OPTS = [ - cfg.DictOpt( - 'goals', - default=default_goals, - required=True, - help='Goals used for the optimization. ' - 'Maps each goal to an associated strategy (for example: ' - 'BASIC_CONSOLIDATION:basic, MY_GOAL:my_strategy_1)'), -] -goals_opt_group = cfg.OptGroup(name='watcher_goals', - title='Goals available for the optimization') -CONF.register_group(goals_opt_group) -CONF.register_opts(WATCHER_GOALS_OPTS, goals_opt_group) - class DefaultStrategySelector(base.BaseSelector): diff --git a/watcher/opts.py b/watcher/opts.py index af237d638..fd7abaf71 100644 --- a/watcher/opts.py +++ b/watcher/opts.py @@ -22,14 +22,11 @@ from watcher.applier import manager as applier_manager from watcher.common import clients from watcher.decision_engine import manager as decision_engine_manger from watcher.decision_engine.planner import manager as planner_manager -from watcher.decision_engine.strategy.selection import default \ - as strategy_selector def list_opts(): return [ ('api', watcher.api.app.API_SERVICE_OPTS), - ('watcher_goals', strategy_selector.WATCHER_GOALS_OPTS), ('watcher_decision_engine', decision_engine_manger.WATCHER_DECISION_ENGINE_OPTS), ('watcher_applier', applier_manager.APPLIER_MANAGER_OPTS),