Browse Source

Merge "Support Ironic Inspector dnsmasq PXE filter"

Zuul 5 months ago
parent
commit
9ca1039e26

+ 3
- 0
ansible/roles/ironic/defaults/main.yml View File

@@ -53,6 +53,7 @@ ironic_services:
53 53
       - "{{ node_config_directory }}/ironic-inspector/:{{ container_config_directory }}/:ro"
54 54
       - "/etc/localtime:/etc/localtime:ro"
55 55
       - "kolla_logs:/var/log/kolla"
56
+      - "ironic_inspector_dhcp_hosts:/var/lib/ironic-inspector/dhcp-hostsdir"
56 57
       - "{{ 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 '' }}"
57 58
     dimensions: "{{ ironic_inspector_dimensions }}"
58 59
     haproxy:
@@ -99,6 +100,7 @@ ironic_services:
99 100
       - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro"
100 101
       - "/etc/localtime:/etc/localtime:ro"
101 102
       - "kolla_logs:/var/log/kolla"
103
+      - "ironic_inspector_dhcp_hosts:/etc/dnsmasq/dhcp-hostsdir:ro"
102 104
     dimensions: "{{ ironic_dnsmasq_dimensions }}"
103 105
 
104 106
 
@@ -180,6 +182,7 @@ ironic_console_serial_speed: "115200n8"
180 182
 ironic_ipxe_url: http://{{ api_interface_address }}:{{ ironic_ipxe_port }}
181 183
 ironic_enable_rolling_upgrade: "yes"
182 184
 ironic_inspector_kernel_cmdline_extras: []
185
+ironic_inspector_pxe_filter: iptables
183 186
 
184 187
 ####################
185 188
 ## Kolla

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

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

+ 8
- 3
ansible/roles/ironic/templates/ironic-inspector.conf.j2 View File

@@ -34,11 +34,16 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
34 34
 policy_file = {{ ironic_policy_file }}
35 35
 {% endif %}
36 36
 
37
-[iptables]
38
-dnsmasq_interface = {{ ironic_dnsmasq_interface }}
39
-
40 37
 [database]
41 38
 connection = mysql+pymysql://{{ ironic_inspector_database_user }}:{{ ironic_inspector_database_password }}@{{ ironic_inspector_database_address }}/{{ ironic_inspector_database_name }}
42 39
 
43 40
 [processing]
44 41
 ramdisk_logs_dir = /var/log/kolla/ironic-inspector
42
+
43
+[pxe_filter]
44
+driver = {{ ironic_inspector_pxe_filter }}
45
+
46
+{% if ironic_inspector_pxe_filter == 'iptables' %}
47
+[iptables]
48
+dnsmasq_interface = {{ ironic_dnsmasq_interface }}
49
+{% endif %}

+ 8
- 0
releasenotes/notes/ironic-inspector-dnsmasq-pxe-filter-ab012028bcd7d332.yaml View File

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

Loading…
Cancel
Save