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

This aligns with the extension that oslo.config expects.

Change-Id: I2b0e75c886fc1710d88a7b20b67e1ff220cfad56
---
 README.md                |  6 +++---
 snap/snap-openstack.yaml | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 0aa9b95..b3139da 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ and $SNAP_COMMON locations:
 
     /var/snap/nova/common/etc/
     ├── nova
-    │   └── conf.d
+    │   └── nova.conf.d
     │       └── nova-snap.conf
     ├── nginx
     │   ├── snap
@@ -51,7 +51,7 @@ area. The default nova configuration can be overridden as follows:
 
     /var/snap/nova/common/etc/
     ├── nova
-    │   ├── conf.d
+    │   ├── nova.conf.d
     │   │   ├── nova-snap.conf
     │   │   ├── database.conf
     │   │   └── rabbitmq.conf
@@ -70,7 +70,7 @@ area. The default nova configuration can be overridden as follows:
         └── nova-placement-api.ini
 
 The nova configuration can be overridden or augmented by writing
-configuration snippets to files in the conf.d directory.
+configuration snippets to files in the nova.conf.d directory.
 
 Alternatively, nova configuration can be overridden by adding a full nova.conf
 file to the nova/ directory. If overriding in this way, you'll need to update
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index fa94d24..ef25a76 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -5,7 +5,7 @@ setup:
   dirs:
     - "{snap_common}/etc"
     - "{snap_common}/etc/nova"
-    - "{snap_common}/etc/nova/conf.d"
+    - "{snap_common}/etc/nova/nova.conf.d"
     - "{snap_common}/etc/nginx"
     - "{snap_common}/etc/nginx/sites-enabled"
     - "{snap_common}/etc/nginx/snap"
@@ -17,7 +17,7 @@ setup:
     - "{snap_common}/log"
     - "{snap_common}/run"
   templates:
-    nova-snap.conf.j2: "{snap_common}/etc/nova/conf.d/nova-snap.conf"
+    nova-snap.conf.j2: "{snap_common}/etc/nova/nova.conf.d/nova-snap.conf"
     nova-nginx.conf.j2: "{snap_common}/etc/nginx/snap/sites-enabled/nova.conf"
     nginx.conf.j2: "{snap_common}/etc/nginx/snap/nginx.conf"
   rchown:
@@ -33,7 +33,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "{snap_common}/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/nova.conf.d"
     log-file: "{snap_common}/log/nova-api-os-compute.log"
     run-as:
       snap-nova: [snap-nova]
@@ -47,7 +47,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "{snap_common}/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/nova.conf.d"
     log-file: "{snap_common}/log/nova-placement-api.log"
     templates:
       nova-placement-api.ini.j2:
@@ -65,7 +65,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "{snap_common}/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/nova.conf.d"
     log-file: "{snap_common}/log/nova-conductor.log"
     run-as:
       snap-nova: [snap-nova]
@@ -76,7 +76,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "{snap_common}/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/nova.conf.d"
     log-file: "{snap_common}/log/nova-scheduler.log"
     run-as:
       snap-nova: [snap-nova]
@@ -87,7 +87,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "{snap_common}/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/nova.conf.d"
     log-file: "{snap_common}/log/nova-consoleauth.log"
     run-as:
       snap-nova: [snap-nova]
@@ -98,6 +98,6 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "{snap_common}/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/nova.conf.d"
     run-as:
       snap-nova: [snap-nova]