Use both SNAP and SNAP_COMMON with --config-file

Ensure that uwsgi configuration file is rendered as part
of the endpoint to pickup required pyargv context variable.

Change-Id: Ic55a4851bd2d82d868f54af9d225f3287c115be5
This commit is contained in:
Corey Bryant 2017-05-05 16:05:05 +00:00 committed by James Page
parent c210ae6e8e
commit e5c9bc4969
2 changed files with 15 additions and 4 deletions

View File

@ -14,11 +14,9 @@ setup:
- "{snap_common}/run"
templates:
nova-snap.conf.j2: "{snap_common}/etc/nova/conf.d/nova-snap.conf"
nova-placement-api.ini.j2: "{snap_common}/etc/uwsgi/nova-placement-api.ini"
nova-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/nova.conf"
nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
copyfiles:
"{snap}/etc/nova": "{snap_common}/etc/nova"
"{snap}/usr/conf": "{snap_common}/etc/nginx"
rchown:
"{snap_common}/lib": "snap-nova:snap-nova"
@ -29,6 +27,7 @@ entry_points:
nova-api-os-compute:
binary: "{snap}/bin/nova-api-os-compute"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
@ -38,7 +37,15 @@ entry_points:
nova-uwsgi:
type: uwsgi
uwsgi-dir: "{snap_common}/etc/uwsgi"
log-file: "{snap_common}/log/uwsgi.log"
uwsgi-log: "{snap_common}/log/uwsgi.log"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
log-file: "{snap_common}/log/nova-placement-api.log"
templates:
nova-placement-api.ini.j2: "{snap_common}/etc/uwsgi/nova-placement-api.ini"
run-as:
snap-nova: [snap-nova]
nova-nginx:
@ -47,6 +54,7 @@ entry_points:
nova-conductor:
binary: "{snap}/bin/nova-conductor"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
@ -56,6 +64,7 @@ entry_points:
nova-scheduler:
binary: "{snap}/bin/nova-scheduler"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
@ -65,6 +74,7 @@ entry_points:
nova-consoleauth:
binary: "{snap}/bin/nova-consoleauth"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
@ -74,6 +84,7 @@ entry_points:
nova-manage:
binary: "{snap}/bin/nova-manage"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"

View File

@ -7,5 +7,5 @@ enable-threads = true
processes = 4
thunder-lock = true
lazy-apps = true
pyargv = --config-file={{ snap_common }}/etc/nova/nova.conf --config-dir={{ snap_common }}/etc/nova/conf.d --log-file={{ snap_common }}/log/nova-placement-api.log
home = {{ snap }}/usr
pyargv = {{ pyargv }}