openstack/kayobe
Code Issues Proposed changes

Fix Bifrost inspection through DHCP-relay

Browse Source 
This is continue of the changes to support Ironic/Bifrost provision
through DHCP-relay same as I9488a72db588e31289907668f1997596a8ccdec6

Depends-On: I74af38dc555b7edee8331e31dfd1a2fbfe4f1151
Change-Id: Ie1d5ecf32c637b77757e56fbe2fae1ff7c0bf000
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2022-03-17 20:29:39 +03:00
parent 5fdf643807
commit d271e705b9
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/kolla-bifrost.yml
View File

@ -9,6 +9,7 @@
# Network configuration. # Network configuration.
kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}" kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}"
kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}" kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}"
kolla_bifrost_dhcp_pool_mask: "{{ provision_oc_net_name | net_mask }}"
kolla_bifrost_dnsmasq_router: "{{ provision_oc_net_name | net_inspection_gateway or provision_oc_net_name | net_gateway }}" kolla_bifrost_dnsmasq_router: "{{ provision_oc_net_name | net_inspection_gateway or provision_oc_net_name | net_gateway }}"
kolla_bifrost_dnsmasq_dns_servers: "{{ resolv_nameservers | default([]) }}" kolla_bifrost_dnsmasq_dns_servers: "{{ resolv_nameservers | default([]) }}"
kolla_bifrost_domain: "{{ resolv_domain | default }}" kolla_bifrost_domain: "{{ resolv_domain | default }}"

1
ansible/roles/kolla-bifrost/defaults/main.yml
View File

@ -30,6 +30,7 @@ kolla_bifrost_extra_kernel_options: []
# IP address range for DHCP. # IP address range for DHCP.
kolla_bifrost_dhcp_pool_start: kolla_bifrost_dhcp_pool_start:
kolla_bifrost_dhcp_pool_end: kolla_bifrost_dhcp_pool_end:
kolla_bifrost_dhcp_pool_mask:
# Default route provided to nodes via DHCP. # Default route provided to nodes via DHCP.
kolla_bifrost_dnsmasq_router: kolla_bifrost_dnsmasq_router:

1
ansible/roles/kolla-bifrost/templates/kolla/config/bifrost/bifrost.yml
View File

@ -11,6 +11,7 @@ extra_kernel_options: "{{ kolla_bifrost_extra_kernel_options if kolla_bifrost_ex
# IP address range for DHCP. # IP address range for DHCP.
dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}" dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}"
dhcp_pool_end: "{{ kolla_bifrost_dhcp_pool_end }}" dhcp_pool_end: "{{ kolla_bifrost_dhcp_pool_end }}"
dhcp_pool_mask: "{{ kolla_bifrost_dhcp_pool_mask }}"
{% if kolla_bifrost_dnsmasq_router %} {% if kolla_bifrost_dnsmasq_router %}
# Default route provided to nodes via DHCP. # Default route provided to nodes via DHCP.

5
releasenotes/notes/bifrost-dhcp-range-netmask-fd40642967042267.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Ironic inspection through Bifrost now work even if DHCP-relay is used.
The dhcp-range in dnsmasq.conf corrctly configured with network mask.