From 302b1c39b08e7a1f40a5d9bce02033dd1c4baf31 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Mon, 24 Apr 2017 09:39:43 -0400
Subject: [PATCH] Go back to installing files to SNAP_COMMON

The symlinks setup key is dropped, and SNAP_COMMON is used as the
root directory where setup dirs, templates, and copyfiles are
installed. This aligns better with how snaps should behave.

Change-Id: I4f339ae90c08d6f624793020690d067b82af4029
---
 snap/snap-openstack.yaml            | 29 ++++++++++++-----------------
 snap/templates/neutron-snap.conf.j2 |  4 ++--
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 0adc727..fee3fe6 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -4,31 +4,26 @@ setup:
     - "{snap_common}/etc/neutron/plugins/ml2"
     - "{snap_common}/etc/neutron/policy.d"
     - "{snap_common}/etc/neutron/rootwrap.d"
-    - "{snap_common}/lib/neutron"
-    - "{snap_common}/log/neutron"
-    - "{snap_common}/lock/neutron"
-  symlinks:
-    "{snap_common}/etc/neutron": /etc/neutron
-    "{snap_common}/lib/neutron": /var/lib/neutron
-    "{snap_common}/log/neutron": /var/log/neutron
-    "{snap_common}/lock/neutron": /var/lock/neutron
+    - "{snap_common}/lib"
+    - "{snap_common}/log"
+    - "{snap_common}/lock"
   templates:
     neutron-snap.conf.j2: "{snap_common}/etc/neutron/conf.d/neutron-snap.conf"
   copyfiles:
     "{snap}/etc/neutron": "{snap_common}/etc/neutron"
 entry_points:
   neutron-db-manage:
-    binary: neutron-db-manage
+    binary: "{snap}/bin/neutron-db-manage"
     config-files:
-      - "/etc/neutron/neutron.conf"
-      - "/etc/neutron/plugins/ml2/ml2_conf.ini"
+      - "{snap_common}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
-      - "/etc/neutron/conf.d"
+      - "{snap_common}/etc/neutron/conf.d"
   neutron-server:
-    binary: neutron-server
+    binary: "{snap}/bin/neutron-server"
     config-files:
-      - "/etc/neutron/neutron.conf"
-      - "/etc/neutron/plugins/ml2/ml2_conf.ini"
+      - "{snap_common}/etc/neutron/neutron.conf"
+      - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
-      - "/etc/neutron/conf.d"
-    log-file: "/var/log/neutron/neutron-server.log"
+      - "{snap_common}/etc/neutron/conf.d"
+    log-file: "{snap_common}/log/neutron-server.log"
diff --git a/snap/templates/neutron-snap.conf.j2 b/snap/templates/neutron-snap.conf.j2
index ed36153..f683970 100644
--- a/snap/templates/neutron-snap.conf.j2
+++ b/snap/templates/neutron-snap.conf.j2
@@ -1,7 +1,7 @@
 [DEFAULT]
 # Set state path to writable directory
-state_path = /var/lib/neutron
+state_path = {{ snap_common }}/lib
 
 [oslo_concurrency]
 # Oslo Concurrency lock path
-lock_path = /var/lock/neutron
+lock_path = {{ snap_common }}/lock