From f1cca0e22f319438acef04529b8be4300f636d92 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:20 -0400
Subject: [PATCH] Add MTU configuration and update for new layout

---
 group_vars/default/vars.yml          |  3 +++
 roles/pvc/templates/pvc/pvcd.yaml.j2 | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/group_vars/default/vars.yml b/group_vars/default/vars.yml
index 3e7a15f..230acc2 100644
--- a/group_vars/default/vars.yml
+++ b/group_vars/default/vars.yml
@@ -48,14 +48,17 @@ pvc_routers:
   - "{{ blsecluster_pvc_upstreamsubnetsnip }}.2"
   - "{{ blsecluster_pvc_upstreamsubnetsnip }}.3"
 pvc_cluster_device: "bond0"
+pvc_cluster_mtu: "1500"
 pvc_cluster_domain: "{{ blsedomains_pvc_clusterdomain }}"
 pvc_cluster_subnet: "{{ blsecluster_pvc_clustersubnetv4 }}"
 pvc_cluster_floatingip: "{{ blsecluster_pvc_clustersubnetsnip }}.252/24"
 pvc_storage_device: "vlan99"
+pvc_storage_mtu: "1500"
 pvc_storage_domain: "{{ blsedomains_pvc_storagedomain }}"
 pvc_storage_subnet: "{{ blsecluster_pvc_storagesubnetv4 }}"
 pvc_storage_floatingip: "{{ blsecluster_pvc_storagesubnetsnip }}.252/24"
 pvc_upstream_device: "vlan100"
+pvc_upstream_mtu: "1500"
 pvc_upstream_domain: "{{ blsedomains_pvc_upstreamdomain }}"
 pvc_upstream_subnet: "{{ blsecluster_pvc_upstreamsubnetv4 }}"
 pvc_upstream_floatingip: "{{ blsecluster_pvc_upstreamsubnetsnip }}.252/24"
diff --git a/roles/pvc/templates/pvc/pvcd.yaml.j2 b/roles/pvc/templates/pvc/pvcd.yaml.j2
index 2104d16..961b8e9 100644
--- a/roles/pvc/templates/pvc/pvcd.yaml.j2
+++ b/roles/pvc/templates/pvc/pvcd.yaml.j2
@@ -63,14 +63,18 @@ pvc:
         stdout_logging: True
         console_log_lines: 1000
       networking:
-        devices:
-          cluster: {{ pvc_cluster_device }}
-          storage: {{ pvc_storage_device }}
-          upstream: {{ pvc_upstream_device }}
-        addresses:
-          cluster: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.cluster_ip }}/{{ node.cluster_cidr }}{% endfor %}
+        cluster:
+          device: {{ pvc_cluster_device }}
+          mtu: {{ pvc_cluster_mtu }}
+          address: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.cluster_ip }}/{{ node.cluster_cidr }}{% endfor %}
 
-          storage: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.storage_ip }}/{{ node.storage_cidr }}{% endfor %}
+        storage:
+          device: {{ pvc_storage_device }}
+          mtu: {{ pvc_storage_mtu }}
+          address: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.storage_ip }}/{{ node.storage_cidr }}{% endfor %}
 
-          upstream: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.upstream_ip }}/{{ node.upstream_cidr }}{% endfor %}
+        upstream:
+          device: {{ pvc_upstream_device }}
+          mtu: {{ pvc_upstream_mtu }}
+          address: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.upstream_ip }}/{{ node.upstream_cidr }}{% endfor %}