openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow configuring a gateway for the inspection network"

Browse Source
This commit is contained in:
Zuul 2018-08-01 13:53:29 +00:00 committed by Gerrit Code Review
commit 94d04c6a68
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/ironic/defaults/main.yml
View File

@ -151,6 +151,7 @@ openstack_ironic_inspector_auth: "{{ openstack_auth }}"
ironic_dnsmasq_interface: "{{ api_interface }}" ironic_dnsmasq_interface: "{{ api_interface }}"
ironic_dnsmasq_dhcp_range: ironic_dnsmasq_dhcp_range:
ironic_dnsmasq_default_gateway:
ironic_dnsmasq_boot_file: "{% if enable_ironic_ipxe | bool %}undionly.kpxe{% else %}pxelinux.0{% endif %}" ironic_dnsmasq_boot_file: "{% if enable_ironic_ipxe | bool %}undionly.kpxe{% else %}pxelinux.0{% endif %}"
ironic_cleaning_network: ironic_cleaning_network:
ironic_console_serial_speed: "115200n8" ironic_console_serial_speed: "115200n8"

3
ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2
View File

@ -1,6 +1,9 @@
port=0 port=0
interface={{ api_interface }} interface={{ api_interface }}
dhcp-range={{ ironic_dnsmasq_dhcp_range }} dhcp-range={{ ironic_dnsmasq_dhcp_range }}
{% if ironic_dnsmasq_default_gateway is not none %}
dhcp-option=3,{{ ironic_dnsmasq_default_gateway }}
{% endif %}
dhcp-option=option:tftp-server,{{ api_interface_address }} dhcp-option=option:tftp-server,{{ api_interface_address }}
dhcp-option=option:server-ip-address,{{ api_interface_address }} dhcp-option=option:server-ip-address,{{ api_interface_address }}
bind-interfaces bind-interfaces

9
doc/source/reference/ironic-guide.rst
View File

@ -30,6 +30,15 @@ network:
.. end .. end
In the same file, optionally a default gateway to be used for the Ironic
Inspector inspection network:
.. code-block:: yaml
ironic_dnsmasq_default_gateway: 192.168.5.1
.. end
In the same file, specify the PXE bootloader file for Ironic Inspector. The In the same file, specify the PXE bootloader file for Ironic Inspector. The
file is relative to the ``/tftpboot`` directory. The default is ``pxelinux.0``, file is relative to the ``/tftpboot`` directory. The default is ``pxelinux.0``,
and should be correct for x86 systems. Other platforms may require a different and should be correct for x86 systems. Other platforms may require a different

6
releasenotes/notes/ironic-dnsmasq-gateway-5a887a0a2f946bd5.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Adds support for configuring a default gateway to be used in the Ironic
Inspector inspection network. This is configured via the
``ironic_dnsmasq_default_gateway`` variable, and is not set by default.