From d34a98ad152663b49f451a49e0b8ac8759b58f07 Mon Sep 17 00:00:00 2001
From: Pete Vander Giessen <pete.vandergiessen@canonical.com>
Date: Tue, 26 Nov 2019 20:27:09 +0000
Subject: [PATCH] Remove iptables part

This change prevents builds in the gate from timing out while pulling
the iptables part, which was happening with increasing frequency.

The part was originally added in an attempt to isolate ourselves
better from the host system, despite being classically confined. This
approach was unreliable -- it doesn't work particularly well for
commands requiring sudo. We can back off this change (especially since
we've removed the special pathing that pointed us at the snapcraft
built iptables anyway -- I think that the part is superfluous).

In addition to the automated tests, I have verified that the following
work:

1. xenial and eoan installs
2. clustering
3. refresh from beta and edge

Change-Id: I7d314eccc0433e54a800ed47add684c2e0fa6565
Closes-bug: 1854081
---
 snapcraft.yaml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2477126..26faa11 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -800,32 +800,6 @@ parts:
       - --with-default-system-dir=/var/snap/$SNAPCRAFT_PROJECT_NAME/common/etc/
     build-attributes: [no-patchelf]
 
-  # Networking tools
-  iptables:
-    source: http://iptables.netfilter.org/projects/iptables/files/iptables-1.6.0.tar.bz2
-    plugin: autotools
-    build-packages:
-      - libnftnl-dev
-    stage-packages:
-      - libatm1
-      # Additional utilties for hypervisor networking
-      - iproute2
-      - bridge-utils
-      - ipset
-    configflags:
-      - --disable-nftables
-      - --prefix=/snap/$SNAPCRAFT_PROJECT_NAME/current
-    override-build: |
-      snapcraftctl build
-      cp --remove-destination $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/sbin/xtables-multi \
-        $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/bin/iptables-xml
-    organize:
-      # Hack to shift installed iptables back to root of snap
-      # required to ensure that pathing to files etc works at
-      # runtime
-      # * is not used to avoid directory merge conflicts
-      snap/microstack/current/: ./
-
   # Templates and other files to be overlaid over the snap.
   overlay:
     plugin: dump