Add install setup key and drop symlinks
The install setup key is introduced to determine the root directory where setup dirs, templates, and copyfiles are installed. We set the install key to 'classic' in snap-openstack.yaml, which results in using / as the root directory. This is used in favor of symlinks which are dropped in this change. Additionally PYTHONPATH is updated as that is required in later snapcraft versions, and /etc/keystone/keystone.conf.d is moved to /etc/keystone/conf.d to align with the other OpenStack snaps. Change-Id: I62ba36d6f3efd3493a8e268bf1babfe232b41764
This commit is contained in:
parent
e62cd74e7e
commit
3394be995d
|
@ -1,3 +1,3 @@
|
|||
# Snap distribution defaults - do not change, override in $SNAP_COMMON/etc/keystone.conf.d
|
||||
# Snap distribution defaults - do not change, override in $SNAP_COMMON/etc/conf.d
|
||||
[database]
|
||||
max_retries = -1
|
||||
|
|
|
@ -1,34 +1,28 @@
|
|||
setup:
|
||||
install: classic
|
||||
dirs:
|
||||
- "{snap_common}/etc/keystone/keystone.conf.d"
|
||||
- "{snap_common}/etc/keystone/fernet-keys"
|
||||
- "{snap_common}/etc/uwsgi"
|
||||
- "{snap_common}/lib/keystone"
|
||||
- "{snap_common}/lock/keystone"
|
||||
- "{snap_common}/log/keystone"
|
||||
- "{snap_common}/log/uwsgi"
|
||||
- "{snap_common}/run/keystone"
|
||||
symlinks:
|
||||
"{snap_common}/etc/keystone": /etc/keystone
|
||||
"{snap_common}/etc/uwsgi": /etc/uwsgi
|
||||
"{snap_common}/lib/keystone": /var/lib/keystone
|
||||
"{snap_common}/lock/keystone": /var/lock/keystone
|
||||
"{snap_common}/log/keystone": /var/log/keystone
|
||||
"{snap_common}/log/uwsgi": /var/log/uwsgi
|
||||
"{snap_common}/run/keystone": /var/run/keystone
|
||||
- "/etc/keystone"
|
||||
- "/etc/keystone/conf.d"
|
||||
- "/etc/keystone/fernet-keys"
|
||||
- "/etc/uwsgi"
|
||||
- "/var/lib/keystone"
|
||||
- "/var/lock/keystone"
|
||||
- "/var/log/keystone"
|
||||
- "/var/log/uwsgi"
|
||||
- "/var/run/keystone"
|
||||
templates:
|
||||
keystone-snap.conf.j2: "{snap_common}/etc/keystone/keystone.conf.d/keystone-snap.conf"
|
||||
admin.ini.j2: "{snap_common}/etc/uwsgi/keystone-admin.ini"
|
||||
public.ini.j2: "{snap_common}/etc/uwsgi/keystone-public.ini"
|
||||
keystone-snap.conf.j2: "/etc/keystone/conf.d/keystone-snap.conf"
|
||||
admin.ini.j2: "/etc/uwsgi/keystone-admin.ini"
|
||||
public.ini.j2: "/etc/uwsgi/keystone-public.ini"
|
||||
copyfiles:
|
||||
"{snap}/etc/keystone": "{snap_common}/etc/keystone"
|
||||
"{snap}/etc/keystone": "/etc/keystone"
|
||||
entry_points:
|
||||
keystone-manage:
|
||||
binary: keystone-manage
|
||||
config-files:
|
||||
- "/etc/keystone/keystone.conf"
|
||||
config-dirs:
|
||||
- "/etc/keystone/keystone.conf.d"
|
||||
- "/etc/keystone/conf.d"
|
||||
keystone-api:
|
||||
type: uwsgi
|
||||
uwsgi-dir: "/etc/uwsgi"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[uwsgi]
|
||||
wsgi-file = {{ snap }}/bin/keystone-wsgi-admin
|
||||
uwsgi-socket = /var/run/keystone-admin.sock
|
||||
uwsgi-socket = /var/run/keystone/admin.sock
|
||||
buffer-size = 65535
|
||||
http = 0.0.0.0:35357
|
||||
master = true
|
||||
|
@ -9,4 +9,4 @@ processes = 4
|
|||
thunder-lock = true
|
||||
plugins = python
|
||||
lazy-apps = true
|
||||
pyargv = --config-file=/etc/keystone/keystone.conf --config-dir=/etc/keystone/keystone.conf.d --log-file=/var/log/keystone/keystone.log
|
||||
pyargv = --config-file=/etc/keystone/keystone.conf --config-dir=/etc/keystone/conf.d --log-file=/var/log/keystone/keystone.log
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[uwsgi]
|
||||
wsgi-file = {{ snap }}/bin/keystone-wsgi-public
|
||||
uwsgi-socket = /var/run/keystone-public.sock
|
||||
uwsgi-socket = /var/run/keystone/public.sock
|
||||
buffer-size = 65535
|
||||
http = 0.0.0.0:5000
|
||||
master = true
|
||||
|
@ -9,4 +9,4 @@ processes = 4
|
|||
thunder-lock = true
|
||||
plugins = python
|
||||
lazy-apps = true
|
||||
pyargv = --config-file=/etc/keystone/keystone.conf --config-dir=/etc/keystone/keystone.conf.d --log-file=/var/log/keystone/keystone.log
|
||||
pyargv = --config-file=/etc/keystone/keystone.conf --config-dir=/etc/keystone/conf.d --log-file=/var/log/keystone/keystone.log
|
||||
|
|
|
@ -11,6 +11,7 @@ grade: devel
|
|||
|
||||
environment:
|
||||
PATH: $PATH:$SNAP/bin/
|
||||
PYTHONPATH: $PYTHONPATH:$SNAP/lib/python2.7/site-packages
|
||||
|
||||
apps:
|
||||
api:
|
||||
|
|
Loading…
Reference in New Issue