From 43829dadc1f782d0abbf267925df3a4b0e4acdb3 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Thu, 3 Feb 2022 14:50:58 +0300 Subject: [PATCH] Multiple DHCP ranges for Ironic Inspector Synchronize with new kolla-ansible parameters introduced in the Ib69fc0017b3bfbc8da4dfd4301710fbf88be661a for Ironic Inspector. Depends-On: Ib69fc0017b3bfbc8da4dfd4301710fbf88be661a Change-Id: I6d9e3acc477c9c4b3bb9db9c01a2db83b9568f59 Signed-off-by: Maksim Malchuk --- ansible/roles/kolla-ansible/templates/kolla/globals.yml | 7 ++++--- ansible/roles/kolla-ansible/tests/test-defaults.yml | 3 +-- ansible/roles/kolla-ansible/tests/test-extras.yml | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ansible/roles/kolla-ansible/templates/kolla/globals.yml b/ansible/roles/kolla-ansible/templates/kolla/globals.yml index 507854caa..3a2f974a8 100644 --- a/ansible/roles/kolla-ansible/templates/kolla/globals.yml +++ b/ansible/roles/kolla-ansible/templates/kolla/globals.yml @@ -419,10 +419,11 @@ libvirt_enable_sasl: {{ kolla_libvirt_enable_sasl | bool }} # Ironic options ############################# {% if kolla_inspector_dhcp_pool_start and kolla_inspector_dhcp_pool_end %} -ironic_dnsmasq_dhcp_range: "{{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }}{% if kolla_inspector_netmask %},{{ kolla_inspector_netmask }}{% endif %}" -{% endif %} +ironic_dnsmasq_dhcp_ranges: + - range: "{{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }}{% if kolla_inspector_netmask %},{{ kolla_inspector_netmask }}{% endif %}" {% if kolla_inspector_default_gateway %} -ironic_dnsmasq_default_gateway: {{ kolla_inspector_default_gateway }} + routers: "{{ kolla_inspector_default_gateway }}" +{% endif %} {% endif %} {% if kolla_inspector_extra_kernel_options %} ironic_inspector_kernel_cmdline_extras: diff --git a/ansible/roles/kolla-ansible/tests/test-defaults.yml b/ansible/roles/kolla-ansible/tests/test-defaults.yml index f922d8c5a..9c948829c 100644 --- a/ansible/roles/kolla-ansible/tests/test-defaults.yml +++ b/ansible/roles/kolla-ansible/tests/test-defaults.yml @@ -124,8 +124,7 @@ - bifrost_network_interface - neutron_external_interface - neutron_bridge_name - - ironic_dnsmasq_dhcp_range - - ironic_dnsmasq_default_gateway + - ironic_dnsmasq_dhcp_ranges - name: Check whether inventory files exist stat: diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index 07f934211..cc55011b0 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/ansible/roles/kolla-ansible/tests/test-extras.yml @@ -246,8 +246,9 @@ kolla_internal_fqdn_cert: "{{ temp_path }}/etc/kolla/certificates/internal.pem" openstack_logging_debug: True grafana_admin_username: "grafana-admin" - ironic_dnsmasq_dhcp_range: "1.2.3.4,1.2.3.5,255.255.255.0" - ironic_dnsmasq_default_gateway: "1.2.3.6" + ironic_dnsmasq_dhcp_ranges: + - range: "1.2.3.4,1.2.3.5,255.255.255.0" + routers: "1.2.3.6" # NOTE: The following options are not present in globals.yml. # It's possible this is related to the use of hostvars and # include_role, caused by something like