From 97cfb648c4ec24f996d79e95e11484aa6ad586c7 Mon Sep 17 00:00:00 2001 From: junboli Date: Wed, 13 Dec 2017 22:49:35 +0800 Subject: [PATCH] Remove unused configuration options Cleanup the deprecated configuration options, these options are no longer used. Change-Id: I4d475246b7ce12adbdbc4b7f65ce9aecd92c5fb5 --- .../configuration/tables/manila-common.inc | 6 ----- manila/coordination.py | 27 +------------------ 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/doc/source/configuration/tables/manila-common.inc b/doc/source/configuration/tables/manila-common.inc index 163488150a..1b5d2c5b4c 100644 --- a/doc/source/configuration/tables/manila-common.inc +++ b/doc/source/configuration/tables/manila-common.inc @@ -114,12 +114,6 @@ - * - ``backend_url`` = ``file://$state_path`` - (String) The back end URL to use for distributed coordination. - * - ``heartbeat`` = ``1.0`` - - (Floating point) Number of seconds between heartbeats for distributed coordination. - * - ``initial_reconnect_backoff`` = ``0.1`` - - (Floating point) Initial number of seconds to wait after failed reconnection. - * - ``max_reconnect_backoff`` = ``60.0`` - - (Floating point) Maximum number of seconds between sequential reconnection retries. * - **[healthcheck]** - * - ``backends`` = diff --git a/manila/coordination.py b/manila/coordination.py index c0eceda458..a8b9feda8a 100644 --- a/manila/coordination.py +++ b/manila/coordination.py @@ -32,32 +32,7 @@ LOG = log.getLogger(__name__) coordination_opts = [ cfg.StrOpt('backend_url', default='file://$state_path', - help='The back end URL to use for distributed coordination.'), - cfg.FloatOpt('heartbeat', - default=1.0, - help='Number of seconds between heartbeats for distributed ' - 'coordination. No longer used since distributed ' - 'coordination manages its heartbeat internally.', - deprecated_for_removal=True, - deprecated_reason='This option is no longer used.', - deprecated_since='5.0.0'), - cfg.FloatOpt('initial_reconnect_backoff', - default=0.1, - help='Initial number of seconds to wait after failed ' - 'reconnection. No longer used since distributed ' - 'coordination manages its heartbeat internally.', - deprecated_for_removal=True, - deprecated_reason='This option is no longer used.', - deprecated_since='5.0.0'), - cfg.FloatOpt('max_reconnect_backoff', - default=60.0, - help='Maximum number of seconds between sequential ' - 'reconnection retries. No longer used since ' - 'distributed coordination manages its heartbeat ' - 'internally.', - deprecated_for_removal=True, - deprecated_reason='This option is no longer used.', - deprecated_since='5.0.0'), + help='The back end URL to use for distributed coordination.') ] CONF = cfg.CONF