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

This aligns with the extension that oslo.config expects.

Change-Id: I86f590d97a41756258aa3184cf94de827f36c0eb
This commit is contained in:
Corey Bryant 2017-06-13 17:55:04 +00:00
parent 7f0d4d4847
commit a4222ce874
2 changed files with 8 additions and 8 deletions

View File

@ -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

View File

@ -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]