From 67273af6d7755a24302366bbabcd730cc2b7df3f Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 15 Dec 2016 14:38:17 +0000
Subject: [PATCH] Enable use of openvswitch interface now its landed in snapd

Change-Id: I7c85de8f501288214e3cc9609c2326f623bf9578
---
 bindep.txt       |  1 +
 requirements.txt |  5 +----
 snapcraft.yaml   | 10 +++++-----
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 bindep.txt

diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 0000000..5816a55
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1 @@
+snapcraft [platform:dpkg]
diff --git a/requirements.txt b/requirements.txt
index 5f39202..b084707 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,2 @@
 # Requirements to build snap
-git+https://github.com/openstack-snaps/snapcraft@fixup-install-requires#egg_name=snapcraft
-# PyPi less dependencies
-https://launchpad.net/ubuntu/+archive/primary/+files/python-apt_1.1.0~beta1build1.tar.xz
-https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz
+# NOTE empty for now untill snapcraft installable from branch
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 76947ae..b38f0bb 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -29,7 +29,7 @@ apps:
       - system-trace
       - hardware-observe
       - libvirt
-#      - openvswitch
+      - openvswitch
   nova-api-metadata:
     command: snap-openstack nova-api-metadata
     daemon: simple
@@ -48,7 +48,7 @@ apps:
       - process-control
       - system-trace
       - system-observe
-#      - openvswitch
+      - openvswitch
   neutron-l3-agent:
     command: snap-openstack neutron-l3-agent
     daemon: simple
@@ -59,7 +59,7 @@ apps:
       - process-control
       - system-trace
       - system-observe
-#      - openvswitch
+      - openvswitch
   neutron-dhcp-agent:
     command: snap-openstack neutron-dhcp-agent
     daemon: simple
@@ -69,7 +69,7 @@ apps:
       - process-control
       - system-trace
       - system-observe
-#      - openvswitch
+      - openvswitch
   neutron-metadata-agent:
     command: snap-openstack neutron-metadata-agent
     daemon: simple
@@ -81,7 +81,7 @@ apps:
     plugs:
       - network
       - network-control
-#      - openvswitch
+      - openvswitch
   neutron-netns-cleanup:
     command: snap-openstack neutron-netns-cleanup
     plugs: