openstack/ironic
Code Issues Proposed changes

Remove deprecated [pxe]/http_* options

Browse Source 
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
This commit is contained in:
Jim Rollenhagen 2016-05-16 09:01:59 -04:00
parent b2d7771431
commit 4da99c1976
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/ironic/ironic.conf.sample
View File

@ -901,11 +901,9 @@
# ironic-conductor node's HTTP server URL. Example: # ironic-conductor node's HTTP server URL. Example:
# http://192.1.2.3:8080 (string value) # http://192.1.2.3:8080 (string value)
# Deprecated group/name - [pxe]/http_url
#http_url = <None> #http_url = <None>
# ironic-conductor node's HTTP root path. (string value) # ironic-conductor node's HTTP root path. (string value)
# Deprecated group/name - [pxe]/http_root
#http_root = /httpboot #http_root = /httpboot
# Priority to run in-band erase devices via the Ironic Python # Priority to run in-band erase devices via the Ironic Python

6
ironic/drivers/modules/deploy_utils.py
View File

@ -50,12 +50,10 @@ from ironic import objects
deploy_opts = [ deploy_opts = [
cfg.StrOpt('http_url', cfg.StrOpt('http_url',
help=_("ironic-conductor node's HTTP server URL. " help=_("ironic-conductor node's HTTP server URL. "
"Example: http://192.1.2.3:8080"), "Example: http://192.1.2.3:8080")),
deprecated_group='pxe'),
cfg.StrOpt('http_root', cfg.StrOpt('http_root',
default='/httpboot', default='/httpboot',
help=_("ironic-conductor node's HTTP root path."), help=_("ironic-conductor node's HTTP root path.")),
deprecated_group='pxe'),
cfg.IntOpt('erase_devices_priority', cfg.IntOpt('erase_devices_priority',
help=_('Priority to run in-band erase devices via the Ironic ' help=_('Priority to run in-band erase devices via the Ironic '
'Python Agent ramdisk. If unset, will use the priority ' 'Python Agent ramdisk. If unset, will use the priority '

5
releasenotes/notes/remove-pxe-http-5a05c54f57747bfe.yaml Normal file
View File

@ -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".