Merge pull request #221 from stackhpc/upstream/2023.1-2023-12-11

Synchronise 2023.1 with upstream
stackhpc · Dec 11, 2023 · b850d5b · b850d5b
2 parents dc22db3 + b30be10
commit b850d5b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ansible/kolla-bifrost-hostvars.yml b/ansible/kolla-bifrost-hostvars.yml
@@ -22,7 +22,7 @@
       # 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
       # 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 }}"
       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) }}"

diff --git a/releasenotes/notes/fix-bifrost-gateway-b4bc8a0396dfa935.yaml b/releasenotes/notes/fix-bifrost-gateway-b4bc8a0396dfa935.yaml
@@ -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.