Merge ~hopem/stsstack-bundles:bug/1874672 into stsstack-bundles:master

[Edward Hope-Morley]

[Felipe Reyes (freyes)]

This is the blessed default by the group of elders who were together at the breakout session.

Hereby I approve this change!

review: Approve

diff --git a/openstack/openstack.yaml.template b/openstack/openstack.yaml.template
index f8a3a1e..7fbc532 100644
--- a/openstack/openstack.yaml.template
+++ b/openstack/openstack.yaml.template
@@ -75,6 +75,9 @@ applications:
       ssl_ca: *ssl_ca
       ssl_cert: *ssl_cert
       ssl_key: *ssl_key
+      global-physnet-mtu: 5000
+      path-mtu: 1550
+      physical-network-mtus: physnet1:1500
   cinder:
     num_units: __NUM_CINDER_UNITS__
     constraints: mem=2G
diff --git a/overlays/neutron-gateway.yaml b/overlays/neutron-gateway.yaml
index 8d96f92..4d629ae 100644
--- a/overlays/neutron-gateway.yaml
+++ b/overlays/neutron-gateway.yaml
@@ -11,7 +11,6 @@ applications:
     options:
       debug: *debug
       verbose: *verbose
-      instance-mtu: 1300
       bridge-mappings: physnet1:br-data
       openstack-origin: *openstack_origin
 relations: