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

Change-Id: Ife9181a8da53b15b8688666b84d0694255232416
---
 snap/snap-openstack.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 3448efd..906f4c4 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -6,18 +6,18 @@ setup:
     - "{snap_common}/lock"
   templates:
     glance-snap.conf.j2: "{snap_common}/etc/glance/conf.d/glance-snap.conf"
-  copyfiles:
-    "{snap}/etc/glance": "{snap_common}/etc/glance"
 entry_points:
   glance-manage:
     binary: "{snap}/bin/glance-manage"
     config-files:
+      - "{snap}/etc/glance/glance.conf"
       - "{snap_common}/etc/glance/glance.conf"
     config-dirs:
       - "{snap_common}/etc/glance/conf.d"
   glance-registry:
     binary: "{snap}/bin/glance-registry"
     config-files:
+      - "{snap}/etc/glance/glance-registry.conf"
       - "{snap_common}/etc/glance/glance-registry.conf"
     config-dirs:
       - "{snap_common}/etc/glance/conf.d"
@@ -25,6 +25,7 @@ entry_points:
   glance-api:
     binary: "{snap}/bin/glance-api"
     config-files:
+      - "{snap}/etc/glance/glance-api.conf"
       - "{snap_common}/etc/glance/glance-api.conf"
     config-dirs:
       - "{snap_common}/etc/glance/conf.d"