Switch from conf.d to <project>.conf.d

This aligns with the extension that oslo.config expects.

Change-Id: Id8dfc31bf3e96108b14c1364f6bd81794e79f265

README.md

@@ -37,7 +37,7 @@ and $SNAP_COMMON locations:
 
     /var/snap/neutron/common/etc/
     └── neutron
-        └── conf.d
+        └── neutron.conf.d
             └── neutron-snap.conf
 
 The neutron snap supports configuration updates via its $SNAP_COMMON writable
@@ -45,7 +45,7 @@ area. The default neutron configuration can be overridden as follows:
 
     /var/snap/neutron/common/etc/
     └── neutron
-        ├── conf.d
+        ├── neutron.conf.d
         │   ├── neutron-snap.conf
         │   ├── database.conf
         │   ├── keystone.conf
@@ -56,7 +56,7 @@ area. The default neutron configuration can be overridden as follows:
                 └── ml2_conf.ini
 
 The neutron configuration can be overridden or augmented by writing
-configuration snippets to files in the conf.d directory.
+configuration snippets to files in the neutron.conf.d directory.
 
 Alternatively, neutron configuration can be overridden by adding a
 neutron/neutron.conf file or a neutron/plugins/ml2/ml2_conf.ini file. If

snap/snap-openstack.yaml

@@ -5,7 +5,7 @@ setup:
   dirs:
     - "{snap_common}/etc"
     - "{snap_common}/etc/neutron"
-    - "{snap_common}/etc/neutron/conf.d"
+    - "{snap_common}/etc/neutron/neutron.conf.d"
     - "{snap_common}/etc/neutron/plugins/ml2"
     - "{snap_common}/etc/neutron/policy.d"
     - "{snap_common}/etc/neutron/rootwrap.d"
@@ -13,7 +13,7 @@ setup:
     - "{snap_common}/log"
     - "{snap_common}/lock"
   templates:
-    neutron-snap.conf.j2: "{snap_common}/etc/neutron/conf.d/neutron-snap.conf"
+    neutron-snap.conf.j2: "{snap_common}/etc/neutron/neutron.conf.d/neutron-snap.conf"
   rchown:
     "{snap_common}/lock": "snap-neutron:snap-neutron"
     "{snap_common}/log": "snap-neutron:snap-neutron"
@@ -28,7 +28,7 @@ entry_points:
       - "{snap_common}/etc/neutron/neutron.conf"
       - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
-      - "{snap_common}/etc/neutron/conf.d"
+      - "{snap_common}/etc/neutron/neutron.conf.d"
     run-as:
       snap-neutron: [snap-neutron]
   neutron-server:
@@ -40,7 +40,7 @@ entry_points:
       - "{snap_common}/etc/neutron/neutron.conf"
       - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
-      - "{snap_common}/etc/neutron/conf.d"
+      - "{snap_common}/etc/neutron/neutron.conf.d"
     log-file: "{snap_common}/log/neutron-server.log"
     run-as:
       snap-neutron: [snap-neutron]