From b8087312ce3cf18fb5b8cd0c3ad1571fc217c93c Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Fri, 5 May 2017 16:01:04 +0000
Subject: [PATCH] Use both SNAP and SNAP_COMMON with --config-file

Change-Id: I8284d4adf638d66be3e1fe27892d8f0e441f1496
---
 snap/snap-openstack.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index fee3fe6..3b8635b 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -9,12 +9,12 @@ setup:
     - "{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: "{snap}/bin/neutron-db-manage"
     config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap}/etc/neutron/plugins/ml2/ml2_conf.ini"
       - "{snap_common}/etc/neutron/neutron.conf"
       - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
@@ -22,6 +22,8 @@ entry_points:
   neutron-server:
     binary: "{snap}/bin/neutron-server"
     config-files:
+      - "{snap}/etc/neutron/neutron.conf"
+      - "{snap}/etc/neutron/plugins/ml2/ml2_conf.ini"
       - "{snap_common}/etc/neutron/neutron.conf"
       - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs: