diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-27 13:06:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-27 13:06:02 +0000 |
| commit | fedc74511b1c2334d42d06356934718f4c57d1f9 (patch) | |
| tree | 40eafc2fc39182e7ebeaf0ad05ea301f10fd8b5c /docker | |
| parent | 5bcfc8c2a758eced575cf5edf79ab3c19a96c952 (diff) | |
| parent | 656828530f331e095ea986cc102d359d6d7f429b (diff) | |
Merge "docker/keystone: Bind mount entire fernet keys repository"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/keystone.yaml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index b7da3cb8..e50315ba 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -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 |