Merge "Support Ironic Inspector dnsmasq PXE filter"

This commit is contained in:
Zuul 2018-11-21 15:10:44 +00:00 committed by Gerrit Code Review
commit 9ca1039e26
4 changed files with 22 additions and 4 deletions

View File

@ -53,6 +53,7 @@ ironic_services:
- "{{ node_config_directory }}/ironic-inspector/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-inspector/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla" - "kolla_logs:/var/log/kolla"
- "ironic_inspector_dhcp_hosts:/var/lib/ironic-inspector/dhcp-hostsdir"
- "{{ kolla_dev_repos_directory ~ '/ironic-inspector/ironic_inspector:/var/lib/kolla/venv/lib/python2.7/site-packages/ironic_inspector' if ironic_dev_mode | bool else '' }}" - "{{ kolla_dev_repos_directory ~ '/ironic-inspector/ironic_inspector:/var/lib/kolla/venv/lib/python2.7/site-packages/ironic_inspector' if ironic_dev_mode | bool else '' }}"
dimensions: "{{ ironic_inspector_dimensions }}" dimensions: "{{ ironic_inspector_dimensions }}"
haproxy: haproxy:
@ -99,6 +100,7 @@ ironic_services:
- "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla" - "kolla_logs:/var/log/kolla"
- "ironic_inspector_dhcp_hosts:/etc/dnsmasq/dhcp-hostsdir:ro"
dimensions: "{{ ironic_dnsmasq_dimensions }}" dimensions: "{{ ironic_dnsmasq_dimensions }}"
@ -180,6 +182,7 @@ ironic_console_serial_speed: "115200n8"
ironic_ipxe_url: http://{{ api_interface_address }}:{{ ironic_ipxe_port }} ironic_ipxe_url: http://{{ api_interface_address }}:{{ ironic_ipxe_port }}
ironic_enable_rolling_upgrade: "yes" ironic_enable_rolling_upgrade: "yes"
ironic_inspector_kernel_cmdline_extras: [] ironic_inspector_kernel_cmdline_extras: []
ironic_inspector_pxe_filter: iptables
#################### ####################
## Kolla ## Kolla

View File

@ -20,4 +20,6 @@ dhcp-option=tag:ipxe,option:bootfile-name,{{ ironic_ipxe_url }}/inspector.ipxe
dhcp-option=tag:efi,tag:!ipxe,option:bootfile-name,ipxe.efi dhcp-option=tag:efi,tag:!ipxe,option:bootfile-name,ipxe.efi
{% endif %} {% endif %}
dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }} dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }}
{% if ironic_inspector_pxe_filter == 'dnsmasq' %}
dhcp-hostsdir=/etc/dnsmasq/dhcp-hostsdir
{% endif %}

View File

@ -34,11 +34,16 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
policy_file = {{ ironic_policy_file }} policy_file = {{ ironic_policy_file }}
{% endif %} {% endif %}
[iptables]
dnsmasq_interface = {{ ironic_dnsmasq_interface }}
[database] [database]
connection = mysql+pymysql://{{ ironic_inspector_database_user }}:{{ ironic_inspector_database_password }}@{{ ironic_inspector_database_address }}/{{ ironic_inspector_database_name }} connection = mysql+pymysql://{{ ironic_inspector_database_user }}:{{ ironic_inspector_database_password }}@{{ ironic_inspector_database_address }}/{{ ironic_inspector_database_name }}
[processing] [processing]
ramdisk_logs_dir = /var/log/kolla/ironic-inspector ramdisk_logs_dir = /var/log/kolla/ironic-inspector
[pxe_filter]
driver = {{ ironic_inspector_pxe_filter }}
{% if ironic_inspector_pxe_filter == 'iptables' %}
[iptables]
dnsmasq_interface = {{ ironic_dnsmasq_interface }}
{% endif %}

View File

@ -0,0 +1,8 @@
---
features:
- |
Adds support for the `Ironic Inspector dnsmasq PXE filter
<https://docs.openstack.org/ironic-inspector/latest/admin/dnsmasq-pxe-filter.html>`__
that provides improved scalability over the default IPTables PXE filter.
This can be enabled by setting ``ironic_inspector_pxe_filter`` to
``dnsmasq``.