From 4da99c1976d0c49f62533d95bf8148361591c2ea Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Mon, 16 May 2016 09:01:59 -0400 Subject: [PATCH] Remove deprecated [pxe]/http_* options This removes [pxe]/http_url and [pxe]/http_root options, which have been deprecated for some time now. These moved to the [deploy] group. Change-Id: I76283ee2bea474d5b0b0c345fe763fdd764a3bfa --- etc/ironic/ironic.conf.sample | 2 -- ironic/drivers/modules/deploy_utils.py | 6 ++---- releasenotes/notes/remove-pxe-http-5a05c54f57747bfe.yaml | 5 +++++ 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/remove-pxe-http-5a05c54f57747bfe.yaml diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 98f0607fe6..895af9eaec 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -901,11 +901,9 @@ # ironic-conductor node's HTTP server URL. Example: # http://192.1.2.3:8080 (string value) -# Deprecated group/name - [pxe]/http_url #http_url = # ironic-conductor node's HTTP root path. (string value) -# Deprecated group/name - [pxe]/http_root #http_root = /httpboot # Priority to run in-band erase devices via the Ironic Python diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py index b0b2dc93ee..50ba3fbc7c 100644 --- a/ironic/drivers/modules/deploy_utils.py +++ b/ironic/drivers/modules/deploy_utils.py @@ -50,12 +50,10 @@ from ironic import objects deploy_opts = [ cfg.StrOpt('http_url', help=_("ironic-conductor node's HTTP server URL. " - "Example: http://192.1.2.3:8080"), - deprecated_group='pxe'), + "Example: http://192.1.2.3:8080")), cfg.StrOpt('http_root', default='/httpboot', - help=_("ironic-conductor node's HTTP root path."), - deprecated_group='pxe'), + help=_("ironic-conductor node's HTTP root path.")), cfg.IntOpt('erase_devices_priority', help=_('Priority to run in-band erase devices via the Ironic ' 'Python Agent ramdisk. If unset, will use the priority ' diff --git a/releasenotes/notes/remove-pxe-http-5a05c54f57747bfe.yaml b/releasenotes/notes/remove-pxe-http-5a05c54f57747bfe.yaml new file mode 100644 index 0000000000..7cdcad2da4 --- /dev/null +++ b/releasenotes/notes/remove-pxe-http-5a05c54f57747bfe.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - Removes deprecated options "[pxe]/http_url" and "[pxe]/http_root". + Configuration files should instead use "[deploy]/http_url" and + "[deploy]/http_root".