From 9beeb433fbf88613c91fd34444eca2e65468e1ab Mon Sep 17 00:00:00 2001
From: Jakub Darmach <jakub@stackhpc.com>
Date: Thu, 30 Mar 2023 12:17:40 +0000
Subject: [PATCH 1/3] Multinode Magnum missing changes

Added missing routing from controllers back to seed node.
Enabled Magnum, added config.
---
 .../inventory/group_vars/controllers/network-interfaces      | 5 +++++
 etc/kayobe/environments/ci-multinode/kolla.yml               | 1 +
 .../environments/ci-multinode/kolla/config/magnum.conf       | 2 ++
 3 files changed, 8 insertions(+)
 create mode 100644 etc/kayobe/environments/ci-multinode/kolla/config/magnum.conf

diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces b/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
index d02d17ead..80b0e6b7f 100644
--- a/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
+++ b/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
@@ -12,6 +12,11 @@ tunnel_interface: "{{ vxlan_interfaces[0].device }}.{{ tunnel_vlan }}"
 
 public_interface: "{{ vxlan_interfaces[0].device }}.{{ public_vlan }}"
 
+public_routes:
+  - cidr: "{{ external_cidr }}"
+    gateway: "{{ public_allocation_pool_start }}"
+
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/environments/ci-multinode/kolla.yml b/etc/kayobe/environments/ci-multinode/kolla.yml
index 5c6c80dae..97ab76f48 100644
--- a/etc/kayobe/environments/ci-multinode/kolla.yml
+++ b/etc/kayobe/environments/ci-multinode/kolla.yml
@@ -4,3 +4,4 @@ kolla_enable_cinder_backup: true
 kolla_enable_neutron_provider_networks: true
 kolla_enable_ovn: true
 kolla_enable_octavia: true
+kolla_enable_magnum: true
diff --git a/etc/kayobe/environments/ci-multinode/kolla/config/magnum.conf b/etc/kayobe/environments/ci-multinode/kolla/config/magnum.conf
new file mode 100644
index 000000000..3a3c45373
--- /dev/null
+++ b/etc/kayobe/environments/ci-multinode/kolla/config/magnum.conf
@@ -0,0 +1,2 @@
+[trust]
+cluster_user_trust = true

From 6d68728f438060a6eb8c985f1e4be02adf4b5449 Mon Sep 17 00:00:00 2001
From: Jakub Darmach <jakub@stackhpc.com>
Date: Thu, 30 Mar 2023 12:29:57 +0000
Subject: [PATCH 2/3] Removed extra empty line

---
 .../inventory/group_vars/controllers/network-interfaces          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces b/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
index 80b0e6b7f..804065fc2 100644
--- a/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
+++ b/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
@@ -16,7 +16,6 @@ public_routes:
   - cidr: "{{ external_cidr }}"
     gateway: "{{ public_allocation_pool_start }}"
 
-
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

From 5c438446d2de1daadac4e3a648e9566fde605780 Mon Sep 17 00:00:00 2001
From: Jakub Darmach <jakub@stackhpc.com>
Date: Wed, 5 Apr 2023 23:03:15 +0200
Subject: [PATCH 3/3] Update
 etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces

Co-authored-by: Mark Goddard <mark@stackhpc.com>
---
 .../inventory/group_vars/controllers/network-interfaces         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces b/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
index 804065fc2..fed18bf18 100644
--- a/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
+++ b/etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
@@ -14,7 +14,7 @@ public_interface: "{{ vxlan_interfaces[0].device }}.{{ public_vlan }}"
 
 public_routes:
   - cidr: "{{ external_cidr }}"
-    gateway: "{{ public_allocation_pool_start }}"
+    gateway: "{{ public_net_name | net_ip('seed') }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.