x/snap-nova
Code Issues Proposed changes

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

Browse Source 
This aligns with the extension that oslo.config expects.

Change-Id: I2b0e75c886fc1710d88a7b20b67e1ff220cfad56
This commit is contained in:
Corey Bryant 2017-06-13 17:46:14 +00:00
parent 86e6d6d8ed
commit 890c993bb5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -35,7 +35,7 @@ and $SNAP_COMMON locations:
/var/snap/nova/common/etc/ /var/snap/nova/common/etc/
├── nova ├── nova
│   └── conf.d │   └── nova.conf.d
│   └── nova-snap.conf │   └── nova-snap.conf
├── nginx ├── nginx
│   ├── snap │   ├── snap
@ -51,7 +51,7 @@ area. The default nova configuration can be overridden as follows:
/var/snap/nova/common/etc/ /var/snap/nova/common/etc/
├── nova ├── nova
│   ├── conf.d │   ├── nova.conf.d
│   │   ├── nova-snap.conf │   │   ├── nova-snap.conf
│   │   ├── database.conf │   │   ├── database.conf
│   │   └── rabbitmq.conf │   │   └── rabbitmq.conf
@ -70,7 +70,7 @@ area. The default nova configuration can be overridden as follows:
└── nova-placement-api.ini └── nova-placement-api.ini
The nova configuration can be overridden or augmented by writing 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 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 file to the nova/ directory. If overriding in this way, you'll need to update

16
snap/snap-openstack.yaml
View File

@ -5,7 +5,7 @@ setup:
dirs: dirs:
- "{snap_common}/etc" - "{snap_common}/etc"
- "{snap_common}/etc/nova" - "{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"
- "{snap_common}/etc/nginx/sites-enabled" - "{snap_common}/etc/nginx/sites-enabled"
- "{snap_common}/etc/nginx/snap" - "{snap_common}/etc/nginx/snap"
@ -17,7 +17,7 @@ setup:
- "{snap_common}/log" - "{snap_common}/log"
- "{snap_common}/run" - "{snap_common}/run"
templates: 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" nova-nginx.conf.j2: "{snap_common}/etc/nginx/snap/sites-enabled/nova.conf"
nginx.conf.j2: "{snap_common}/etc/nginx/snap/nginx.conf" nginx.conf.j2: "{snap_common}/etc/nginx/snap/nginx.conf"
rchown: rchown:
@ -33,7 +33,7 @@ entry_points:
config-files-override: config-files-override:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: 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" log-file: "{snap_common}/log/nova-api-os-compute.log"
run-as: run-as:
snap-nova: [snap-nova] snap-nova: [snap-nova]
@ -47,7 +47,7 @@ entry_points:
config-files-override: config-files-override:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/nova.conf.d"
log-file: "{snap_common}/log/nova-placement-api.log" log-file: "{snap_common}/log/nova-placement-api.log"
templates: templates:
nova-placement-api.ini.j2: nova-placement-api.ini.j2:
@ -65,7 +65,7 @@ entry_points:
config-files-override: config-files-override:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/nova.conf.d"
log-file: "{snap_common}/log/nova-conductor.log" log-file: "{snap_common}/log/nova-conductor.log"
run-as: run-as:
snap-nova: [snap-nova] snap-nova: [snap-nova]
@ -76,7 +76,7 @@ entry_points:
config-files-override: config-files-override:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/nova.conf.d"
log-file: "{snap_common}/log/nova-scheduler.log" log-file: "{snap_common}/log/nova-scheduler.log"
run-as: run-as:
snap-nova: [snap-nova] snap-nova: [snap-nova]
@ -87,7 +87,7 @@ entry_points:
config-files-override: config-files-override:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/nova.conf.d"
log-file: "{snap_common}/log/nova-consoleauth.log" log-file: "{snap_common}/log/nova-consoleauth.log"
run-as: run-as:
snap-nova: [snap-nova] snap-nova: [snap-nova]
@ -98,6 +98,6 @@ entry_points:
config-files-override: config-files-override:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/nova.conf.d"
run-as: run-as:
snap-nova: [snap-nova] snap-nova: [snap-nova]