From 9cfed61a072c2696625e3b3c430bc64c20b368ed Mon Sep 17 00:00:00 2001
From: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
Date: Mon, 28 Sep 2020 19:23:55 +0300
Subject: [PATCH] Minor fixes per review 738242

* Set max_header_size to 38 per the upstream Neutron guide albeit the
header size can be variable:
https://tools.ietf.org/html/draft-ietf-nvo3-geneve-16#page-14

* The empty "plugs" entry results in the following error raised by the
auto-review tool of the snap store:

"invalid plugs entry (empty) lint-snap-v2_app_plugs (rabbitmq-plugins)"

Let's avoid this by removing the section altogether.

Change-Id: I1b192140c8ca3445bd817f7e583f303d1bb0a338
---
 snap-overlay/etc/neutron/plugins/ml2/ml2_conf.ini | 2 +-
 snapcraft.yaml                                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/snap-overlay/etc/neutron/plugins/ml2/ml2_conf.ini b/snap-overlay/etc/neutron/plugins/ml2/ml2_conf.ini
index 2c4de5c..009d242 100644
--- a/snap-overlay/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/snap-overlay/etc/neutron/plugins/ml2/ml2_conf.ini
@@ -7,7 +7,7 @@ external_network_type = flat
 
 [ml2_type_geneve]
 vni_ranges = 1:65535
-max_header_size = 40
+max_header_size = 38
 
 [ml2_type_flat]
 flat_networks = *
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3735b13..07af8c6 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -476,7 +476,6 @@ apps:
     command: usr/sbin/rabbitmq-plugins
     environment:
       HOME: $SNAP_COMMON/lib/rabbitmq
-    plugs: []
       # TODO: - microstack-support
 
   # Memcached