openstack/kayobe
Code Issues Proposed changes

Fix gateway assignment when seed SNAT is disabled

Browse Source 
Fix a logic issue when seed SNAT is not enabled. In this circumstance
Bifrost was generating ConfigDrive data with the default gateway unset
even when one is available on the admin network. This regression was
introduced in Ib847d3420dee374cec067cd8af519b510be04120 [1].

[1] https://review.opendev.org/c/openstack/kayobe/+/898434

Closes-Bug: #2045926
Change-Id: Ifd9f9cd389ac09448fc91dba74f8f09595698b55
This commit is contained in:
Stig Telfer 2023-11-28 21:55:32 +00:00 committed by Pierre Riteau
parent d264a17ed2
commit 49f91043c6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/kolla-bifrost-hostvars.yml
View File

@ -22,7 +22,7 @@
# If the admin network does not have a gateway defined and seed SNAT is # If the admin network does not have a gateway defined and seed SNAT is
# enabled, use the seed as a gateway to allow external access until other # enabled, use the seed as a gateway to allow external access until other
# networks have been configured. Otherwise, do not set any gateway. # networks have been configured. Otherwise, do not set any gateway.
ipv4_gateway: "{{ admin_oc_net_name | net_gateway or admin_oc_net_name | net_ip(seed_host) if seed_enable_snat | bool }}" ipv4_gateway: "{{ (admin_oc_net_name | net_gateway) or (admin_oc_net_name | net_ip(seed_host) if seed_enable_snat | bool) }}"
ipv4_nameserver: "{{ resolv_nameservers }}" ipv4_nameserver: "{{ resolv_nameservers }}"
network_mtu: "{{ admin_oc_net_name | net_mtu or '1500' }}" network_mtu: "{{ admin_oc_net_name | net_mtu or '1500' }}"
vlan_id: "{{ '' if admin_oc_net_name == provision_oc_net_name else (admin_oc_net_name | net_vlan) }}" vlan_id: "{{ '' if admin_oc_net_name == provision_oc_net_name else (admin_oc_net_name | net_vlan) }}"

6
releasenotes/notes/fix-bifrost-gateway-b4bc8a0396dfa935.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes gateway assignment when seed SNAT is disabled. In this circumstance
Bifrost was generating ConfigDrive data with the default gateway unset even
when one is available on the admin network.