From 6ec96773835dcefaf16228b31f4974183551efcf Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Mon, 18 Nov 2019 16:23:54 +0800 Subject: [PATCH] Drop [agent]heartbeat_timeout The configuration option was deprecated before ocata (even earlier), this patch drops the deprecated option. Change-Id: I4cdff9a94aad580d22e93dcb5b9bd4aeef1412f8 --- ironic/conf/api.py | 1 - .../remove-agent-heartbeat-timeout-abf8787b8477bae7.yaml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/remove-agent-heartbeat-timeout-abf8787b8477bae7.yaml diff --git a/ironic/conf/api.py b/ironic/conf/api.py index 9dee76183a..bda28d55ab 100644 --- a/ironic/conf/api.py +++ b/ironic/conf/api.py @@ -61,7 +61,6 @@ opts = [ 'in certain states.')), cfg.IntOpt('ramdisk_heartbeat_timeout', default=300, - deprecated_group='agent', deprecated_name='heartbeat_timeout', help=_('Maximum interval (in seconds) for agent heartbeats.')), ] diff --git a/releasenotes/notes/remove-agent-heartbeat-timeout-abf8787b8477bae7.yaml b/releasenotes/notes/remove-agent-heartbeat-timeout-abf8787b8477bae7.yaml new file mode 100644 index 0000000000..d5019a1190 --- /dev/null +++ b/releasenotes/notes/remove-agent-heartbeat-timeout-abf8787b8477bae7.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The configuration option ``[agent]heartbeat_timeout`` was deprecated + before ocata release and now removed, please use + ``[api]ramdisk_heartbeat_timeout`` instead.