From a4222ce8749e28130f7a089fcb5f9eb2fd8034e6 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 13 Jun 2017 17:55:04 +0000
Subject: [PATCH] Switch from conf.d to <project>.conf.d

This aligns with the extension that oslo.config expects.

Change-Id: I86f590d97a41756258aa3184cf94de827f36c0eb
---
 README.md                |  6 +++---
 snap/snap-openstack.yaml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index af5ab9d..09218e9 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ and $SNAP_COMMON locations:
 
     /var/snap/glance/common/etc/
     └── glance
-        └── conf.d
+        └── glance.conf.d
             └── glance-snap.conf
 
 The glance snap supports configuration updates via its $SNAP_COMMON writable
@@ -41,7 +41,7 @@ area. The default glance configuration can be overridden as follows:
 
     /var/snap/glance/common/etc/
     └── glance
-        ├── conf.d
+        ├── glance.conf.d
         │   ├── glance-snap.conf
         │   ├── database.conf
         │   └── keystone.conf
@@ -50,7 +50,7 @@ area. The default glance configuration can be overridden as follows:
         └── glance-registry.conf
 
 The glance configuration can be overridden or augmented by writing
-configuration snippets to files in the conf.d directory.
+configuration snippets to files in the glance.conf.d directory.
 
 Alternatively, glance configuration can be overridden by adding full config
 files to the glance/ directory. If overriding in this way, you'll need to
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index b4edaf0..37b1c6e 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -4,13 +4,13 @@ setup:
   default-owner: "root:snap-glance"
   dirs:
     - "{snap_common}/etc"
-    - "{snap_common}/etc/glance/conf.d"
+    - "{snap_common}/etc/glance/glance.conf.d"
     - "{snap_common}/lib"
     - "{snap_common}/lib/images"
     - "{snap_common}/lock"
     - "{snap_common}/log"
   templates:
-    glance-snap.conf.j2: "{snap_common}/etc/glance/conf.d/glance-snap.conf"
+    glance-snap.conf.j2: "{snap_common}/etc/glance/glance.conf.d/glance-snap.conf"
   rchown:
     "{snap_common}/lib": "snap-glance:snap-glance"
     "{snap_common}/lock": "snap-glance:snap-glance"
@@ -23,7 +23,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/glance/glance-manage.conf"
     config-dirs:
-      - "{snap_common}/etc/glance/conf.d"
+      - "{snap_common}/etc/glance/glance.conf.d"
     run-as:
       snap-glance: [snap-glance]
   glance-registry:
@@ -33,7 +33,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/glance/glance-registry.conf"
     config-dirs:
-      - "{snap_common}/etc/glance/conf.d"
+      - "{snap_common}/etc/glance/glance.conf.d"
     log-file: "{snap_common}/log/glance-registry.log"
     run-as:
       snap-glance: [snap-glance]
@@ -44,7 +44,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/glance/glance-api.conf"
     config-dirs:
-      - "{snap_common}/etc/glance/conf.d"
+      - "{snap_common}/etc/glance/glance.conf.d"
     log-file: "{snap_common}/log/glance-api.log"
     run-as:
       snap-glance: [snap-glance]