Merge "Make sure glance_api_tls_proxy logs are persisted on the host" into stable/queens

This commit is contained in:
Zuul 2019-12-17 13:07:24 +00:00 committed by Gerrit Code Review
commit a93b895095
2 changed files with 3 additions and 0 deletions

View File

@ -231,6 +231,7 @@ outputs:
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- {get_attr: [GlanceLogging, volumes]}
-
- /var/lib/kolla/config_files/glance_api_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro

View File

@ -16,6 +16,7 @@ outputs:
description: The volumes needed to log to files in the host.
value: &glance_api_volumes
- /var/log/containers/glance:/var/log/glance
- /var/log/containers/httpd/glance:/var/log/httpd:z
docker_config:
description: Extra containers needed for logging to files in the host.
value:
@ -38,6 +39,7 @@ outputs:
with_items:
- { 'path': /var/log/containers/glance, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/glance, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/containers/httpd/glance, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
- name: glance logs readme
copy:
dest: /var/log/glance/readme.txt