From 2994aa17ffc6bc17df038cb2fa5301bc333d173b Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 28 Nov 2016 18:13:17 +0000
Subject: [PATCH] Add use of openvswitch interface (wip), keep sudo running to
 placate ovs-agent, drop override of root_helper

---
 snap/bin/sudo                 | 2 +-
 snap/etc/neutron/neutron.conf | 4 ----
 snap/etc/nova/nova.conf       | 1 -
 snapcraft.yaml                | 5 +++++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/snap/bin/sudo b/snap/bin/sudo
index 58f48f8..b3f018c 100755
--- a/snap/bin/sudo
+++ b/snap/bin/sudo
@@ -2,4 +2,4 @@
 # fake sudo script - as daemons run as root use of real sudo is not required
 # strip sudo off args and re-exec command
 
-exec ${@:1}
+${@}
diff --git a/snap/etc/neutron/neutron.conf b/snap/etc/neutron/neutron.conf
index 7447794..17dc48c 100644
--- a/snap/etc/neutron/neutron.conf
+++ b/snap/etc/neutron/neutron.conf
@@ -1,6 +1,2 @@
 # Snap provided defaults for neutron agents
 [DEFAULT]
-
-[AGENT]
-# Disable root_helper for snap usage
-root_helper =
diff --git a/snap/etc/nova/nova.conf b/snap/etc/nova/nova.conf
index 241b7be..5a0bddd 100644
--- a/snap/etc/nova/nova.conf
+++ b/snap/etc/nova/nova.conf
@@ -1,6 +1,5 @@
 [DEFAULT]
 compute_driver = libvirt.LibvirtDriver
-root_helper =
 
 [libvirt]
 virt_type = kvm
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 733e44e..fd2f8a9 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -27,6 +27,7 @@ apps:
       - firewall-control
       - system-trace
       - libvirt
+      - openvswitch
   neutron-openvswitch-agent:
     command: snap-openstack neutron-openvswitch-agent
     daemon: simple
@@ -38,6 +39,7 @@ apps:
       - process-control
       - system-trace
       - system-observe
+      - openvswitch
   neutron-l3-agent:
     command: snap-openstack neutron-l3-agent
     daemon: simple
@@ -48,6 +50,7 @@ apps:
       - process-control
       - system-trace
       - system-observe
+      - openvswitch
   neutron-dhcp-agent:
     command: snap-openstack neutron-dhcp-agent
     daemon: simple
@@ -57,6 +60,7 @@ apps:
       - process-control
       - system-trace
       - system-observe
+      - openvswitch
   neutron-metadata-agent:
     command: snap-openstack neutron-metadata-agent
     daemon: simple
@@ -69,6 +73,7 @@ apps:
     plugs:
       - network
       - network-control
+      - openvswitch
   neutron-netns-cleanup:
     command: snap-openstack neutron-netns-cleanup
     plugs: