From b7f8005fa5605cd8db216859ffaaa83e6aa6c538 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Tue, 3 Oct 2017 14:33:38 -0500 Subject: [PATCH] Remove deprecated heartbeat options Cluster locking heartbeat options were marked deprecated in 42dafd2705a8cb4346c396376977c705e55d9e7c with the move to using the tooz built in hearbeating. These options are now removed. Note, in the release note for the deprecation we actually stated these options were removed, not deprecated, so this patch does not include an additional release note pointing this out. Change-Id: Iae30e9263044a7ef04fbe5b826cfcc7aa41add5a --- cinder/coordination.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/cinder/coordination.py b/cinder/coordination.py index f347ba089a6..7fa6f55ade0 100644 --- a/cinder/coordination.py +++ b/cinder/coordination.py @@ -33,31 +33,6 @@ coordination_opts = [ cfg.StrOpt('backend_url', default='file://$state_path', help='The backend 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='11.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='11.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='11.0.0'), ] CONF = cfg.CONF