From b2d7771431842cbecd6166983908af32f871b44c Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Mon, 16 May 2016 08:58:17 -0400 Subject: [PATCH] Remove [agent]/manage_tftp option This has been deprecated since August 2015, remove it. Change-Id: I885c922914127608e52753773fdeaf41e0dba2a0 --- etc/ironic/ironic.conf.sample | 1 - ironic/drivers/modules/agent.py | 1 - releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 843773644f..98f0607fe6 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -412,7 +412,6 @@ # Whether Ironic will manage booting of the agent ramdisk. If # set to False, you will need to configure your mechanism to # allow booting the agent ramdisk. (boolean value) -# Deprecated group/name - [agent]/manage_tftp #manage_agent_boot = true # The memory size in MiB consumed by agent when it is booted diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py index e5e587f319..971bd63ed8 100644 --- a/ironic/drivers/modules/agent.py +++ b/ironic/drivers/modules/agent.py @@ -40,7 +40,6 @@ from ironic.drivers.modules import deploy_utils agent_opts = [ cfg.BoolOpt('manage_agent_boot', default=True, - deprecated_name='manage_tftp', help=_('Whether Ironic will manage booting of the agent ' 'ramdisk. If set to False, you will need to configure ' 'your mechanism to allow booting the agent ' diff --git a/releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml b/releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml new file mode 100644 index 0000000000..4e0e028df6 --- /dev/null +++ b/releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - Removes deprecated option "[agent]/manage_tftp". Configuration + files should instead use the "[agent]/manage_agent_boot" option.