From dcc415e4f9eccfc957e80928df7839c513512972 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Fri, 27 Oct 2017 08:26:53 +0300 Subject: [PATCH] glance logging: Fix description and use yaml anchor This cleans up the file logging template by fixing up some descriptions that were left written wrongly and using an anchor to specify the volumes to avoid repetition. bp logging-stdout-rsyslog Change-Id: If0daf6a0fd47cc1e9bb8c7bef6f8f702096e8152 --- docker/services/logging/files/glance-api.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/docker/services/logging/files/glance-api.yaml b/docker/services/logging/files/glance-api.yaml index 52c2f2a781..3c50e8b7a7 100644 --- a/docker/services/logging/files/glance-api.yaml +++ b/docker/services/logging/files/glance-api.yaml @@ -10,8 +10,13 @@ parameters: outputs: config_settings: - description: The volumes needed to log to files in the host. + description: Extra hieradata needed to log to files in the host. value: null + volumes: + 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-api:/var/log/httpd docker_config: description: Extra containers needed for logging to files in the host. value: @@ -21,15 +26,8 @@ outputs: image: {get_param: DockerGlanceApiImage} privileged: false user: root - volumes: - - /var/log/containers/glance:/var/log/glance - - /var/log/containers/httpd/glance-api:/var/log/httpd + volumes: *glance_api_volumes command: ['/bin/bash', '-c', 'chown -R glance:glance /var/log/glance'] - volumes: - description: extra volumes - value: - - /var/log/containers/glance:/var/log/glance - - /var/log/containers/httpd/glance-api:/var/log/httpd host_prep_tasks: description: Extra ansible tasks needed for logging to files in the host. value: