From e6b23a0856e3e26dfd676da39a6149c9a5c0b535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fran=C3=A7oise?= Date: Thu, 31 Mar 2016 14:41:25 +0200 Subject: [PATCH] Remove watcher_goals section from devstack plugin In this changeset, I removed the now useless [watcher_goals] section from the devstack plugin. Partially Implements: blueprint get-goal-from-strategy Change-Id: Iaa986f426dc47f6cbd04e74f16b67670e3563967 --- devstack/lib/watcher | 2 -- devstack/local.conf.controller | 4 ---- 2 files changed, 6 deletions(-) diff --git a/devstack/lib/watcher b/devstack/lib/watcher index 68529c8af..b2b3a14fe 100644 --- a/devstack/lib/watcher +++ b/devstack/lib/watcher @@ -123,8 +123,6 @@ function create_watcher_conf { iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST - iniset $WATCHER_CONF watcher_goals goals "DUMMY:dummy,SERVER_CONSOLIDATION:basic" - configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR "watcher_clients_auth" diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller index bbad36ef9..e446cecdf 100644 --- a/devstack/local.conf.controller +++ b/devstack/local.conf.controller @@ -42,7 +42,3 @@ LOGDAYS=2 [[post-config|$NOVA_CONF]] [DEFAULT] compute_monitors=cpu.virt_driver - -[[post-config|$WATCHER_CONF]] -[watcher_goals] -goals=BASIC_CONSOLIDATION:basic,DUMMY:dummy