openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "docker/keystone: Bind mount entire fernet keys repository"

This commit is contained in:
Jenkins 2017-03-27 13:06:02 +00:00 committed by Gerrit Code Review
parent 5bcfc8c2a7 656828530f
commit fedc74511b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/services/keystone.yaml
View File

@ -89,16 +89,6 @@ outputs:
owner: keystone
perm: '0600'
source: /var/lib/kolla/config_files/src/etc/keystone/credential-keys/1
- dest: /etc/keystone/fernet-keys/0
owner: keystone
perm: '0600'
source: /var/lib/kolla/config_files/src/etc/keystone/fernet-keys/0
optional: {if: [keystone_fernet_tokens, false, true]}
- dest: /etc/keystone/fernet-keys/1
owner: keystone
perm: '0600'
source: /var/lib/kolla/config_files/src/etc/keystone/fernet-keys/1
optional: {if: [keystone_fernet_tokens, false, true]}
- dest: /etc/httpd/conf.d/10-keystone_wsgi_admin.conf
owner: root
perm: '0644'
@ -145,6 +135,11 @@ outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- logs:/var/log
-
if:
- keystone_fernet_tokens
- /var/lib/config-data/keystone/etc/keystone/fernet-keys:/etc/keystone/fernet-keys:ro
- ''
environment:
- KOLLA_BOOTSTRAP=True
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS