x
/
snap-keystone
Code Issues Proposed changes

Merge "Use keystone.conf from both SNAP and SNAP_COMMON"

This commit is contained in:
Jenkins 2017-05-19 08:56:49 +00:00 committed by Gerrit Code Review
parent 5b78a19ccd 91aabb8aa8
commit c30e9203b2
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
snap/snap-openstack.yaml
View File

@ -14,13 +14,10 @@ setup:
- "{snap_common}/log"
- "{snap_common}/run"
templates:
admin.ini.j2: "{snap_common}/etc/uwsgi/admin.ini"
keystone-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/keystone.conf"
keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
public.ini.j2: "{snap_common}/etc/uwsgi/public.ini"
copyfiles:
"{snap}/etc/keystone": "{snap_common}/etc/keystone"
"{snap}/usr/conf": "{snap_common}/etc/nginx"
rchown:
"{snap_common}/fernet-keys": "snap-keystone:snap-keystone"
@ -32,6 +29,7 @@ entry_points:
keystone-manage:
binary: "{snap}/bin/keystone-manage"
config-files:
- "{snap}/etc/keystone/keystone.conf"
- "{snap_common}/etc/keystone/keystone.conf"
config-dirs:
- "{snap_common}/etc/keystone/conf.d"
@ -40,7 +38,16 @@ entry_points:
keystone-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/keystone/keystone.conf"
- "{snap_common}/etc/keystone/keystone.conf"
config-dirs:
- "{snap_common}/etc/keystone/conf.d"
log-file: "{snap_common}/log/keystone.log"
templates:
admin.ini.j2: "{snap_common}/etc/uwsgi/admin.ini"
public.ini.j2: "{snap_common}/etc/uwsgi/public.ini"
run-as:
snap-keystone: [snap-keystone]
keystone-nginx:

2
snap/templates/admin.ini.j2
View File

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

2
snap/templates/public.ini.j2
View File

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