openstack/ironic
Code Issues Proposed changes

Merge "Deprecate [pxe]ip_version parameter"

Browse Source
This commit is contained in:
Zuul 2021-07-05 15:04:33 +00:00 committed by Gerrit Code Review
commit e3b401baf6
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/ironic
View File

@ -1465,9 +1465,6 @@ function configure_ironic {
iniset_rpc_backend ironic $IRONIC_CONF_FILE iniset_rpc_backend ironic $IRONIC_CONF_FILE
fi fi
# Set IP version
iniset $IRONIC_CONF_FILE pxe ip_version $IRONIC_IP_VERSION
# Configure Ironic conductor, if it was enabled. # Configure Ironic conductor, if it was enabled.
if is_service_enabled ir-cond; then if is_service_enabled ir-cond; then
configure_ironic_conductor configure_ironic_conductor

1
doc/source/admin/report.txt
View File

@ -577,7 +577,6 @@ pxe:
image_cache_ttl = 10080 image_cache_ttl = 10080
images_path = /var/lib/ironic/images/ images_path = /var/lib/ironic/images/
instance_master_path = /var/lib/ironic/master_images instance_master_path = /var/lib/ironic/master_images
ip_version = 4
ipxe_boot_script = /opt/stack/ironic/ironic/drivers/modules/boot.ipxe ipxe_boot_script = /opt/stack/ironic/ironic/drivers/modules/boot.ipxe
ipxe_enabled = True ipxe_enabled = True
ipxe_timeout = 0 ipxe_timeout = 0

14
doc/source/install/configure-ipv6-networking.rst
View File

@ -10,13 +10,13 @@ configuration. This page covers the IPv6 specifics only. Please refer to
Configure ironic PXE driver for provisioning using IPv6 addressing Configure ironic PXE driver for provisioning using IPv6 addressing
================================================================== ==================================================================
The ironic PXE driver operates in either IPv4 or IPv6 mode (IPv4 is the The PXE drivers operate in such a way that they are able to utilize
default). To enable IPv6 mode, set the ``[pxe]/ip_version`` option in the Bare both IPv4 and IPv6 addresses based upon the deployment's operating state and
Metal Service's configuration file (``/etc/ironic/ironic.conf``) to ``6``. configuration. Internally, the drivers attempt to prepare configuration options for both formats, which allows ports which are IPv6 only to automatically
receieve boot parameters. As a result of this, it is critical that the
.. Note:: Support for dual mode IPv4 and IPv6 operations is planned for a ``[DEFAULT]my_ipv6`` configuration parameter is set to the conductor's
future version of ironic. IPv6 address. This option is unique per conductor, and due to the nature
of automatic address assignment, it cannot be "guessed" by the software.
Provisioning with IPv6 stateless addressing Provisioning with IPv6 stateless addressing
------------------------------------------- -------------------------------------------

4
ironic/conf/pxe.py
View File

@ -155,8 +155,10 @@ opts = [
choices=[('4', _('IPv4')), choices=[('4', _('IPv4')),
('6', _('IPv6'))], ('6', _('IPv6'))],
mutable=True, mutable=True,
deprecated_for_removal=True,
help=_('The IP version that will be used for PXE booting. ' help=_('The IP version that will be used for PXE booting. '
'Defaults to 4. EXPERIMENTAL')), 'Defaults to 4. This option has been a no-op for in-tree'
'drivers since the Ussuri development cycle.')),
cfg.BoolOpt('ipxe_use_swift', cfg.BoolOpt('ipxe_use_swift',
default=False, default=False,
mutable=True, mutable=True,

7
releasenotes/notes/remove_pxe_ip_version-7a71f821ded28360.yaml Normal file
View File

@ -0,0 +1,7 @@
---
deprecations:
- |
The ``[pxe]ip_version`` setting has been deprecated and is anticipated to
be removed in the Y* release of OpenStack. This option effectively has had
no operational impact since the Ussuri release of OpenStack where dual
stack IPv4 and IPv6 support was added to Ironic.