From 8590e3d3fc2b4bbcbc78a2be7034c5f73a5e6d9e Mon Sep 17 00:00:00 2001
From: Pete Vander Giessen <pete.vandergiessen@canonical.com>
Date: Wed, 10 Oct 2018 20:00:22 +0000
Subject: [PATCH] Added missing ovs-wrapped, and added important dir to library
 path.

---
 conf/bin/ovs-wrapper | 16 ++++++++++++++++
 snapcraft.yaml       |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100755 conf/bin/ovs-wrapper

diff --git a/conf/bin/ovs-wrapper b/conf/bin/ovs-wrapper
new file mode 100755
index 0000000..0c276e5
--- /dev/null
+++ b/conf/bin/ovs-wrapper
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+export OVS_LOGDIR=${SNAP_COMMON}/log/openvswitch
+export OVS_RUNDIR=${SNAP_COMMON}/run/openvswitch
+export OVS_SYSCONFDIR=${SNAP_COMMON}/etc
+export OVS_PKGDATADIR=${SNAP}/share/openvswitch
+export OVS_BINDIR=${SNAP}/bin
+export OVS_SBINDIR=${SNAP}/sbin
+
+mkdir -p ${OVS_LOGDIR}
+mkdir -p ${OVS_RUNDIR}
+mkdir -p ${OVS_SYSCONFDIR}/openvswitch
+
+exec $@
diff --git a/snapcraft.yaml b/snapcraft.yaml
index a46d565..3fcd3aa 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -8,7 +8,7 @@ description: |
 grade: devel
 confinement: classic
 environment:
-  LD_LIBRARY_PATH: $SNAP/lib:$SNAP/usr/lib
+  LD_LIBRARY_PATH: $SNAP/lib:$SNAP/usr/lib:$SNAP/usr/lib/x86_64-linux-gnu
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
   LC_ALL: C
   OS_PLACEMENT_CONFIG_DIR: $SNAP/etc/nova/
@@ -372,6 +372,12 @@ parts:
         echo
       done
 
+  ovs-wrapper:
+    source: conf
+    plugin: dump
+    after:
+      - openvswitch
+
   # Openstack Shared Parts
   templates:
     after: [keystone, nova, neutron, openvswitch]