From 84e9425edab83578d09fa612a1e772b188a9c3db Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 14 Nov 2017 08:11:20 +0000 Subject: [PATCH] Polish swift containers logging configuration The logging directories are not used by swift, which in turn logs to syslog. So the unnecessary bind-mounts were removed. Furthermore, as part of the swift package which is included in the overcloud image, there is an rsyslog rule which gets the swift logs and persists them in /var/log/swift. Due to this and to be consistent with the rest of the containers. A symlink was created to have the swift logs available from /var/log/containers/swift as well. This makes the readme indicating the change of place of the logs unnecessary, so that was removed as well. Closes-Bug: #1732107 Change-Id: I61610d3cb187235ac316e1c5de0a344be3ebb1e2 --- docker/services/swift-proxy.yaml | 21 ++++++-------------- docker/services/swift-storage.yaml | 32 ++++++------------------------ 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index d2af9a9900..64049c348d 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -88,10 +88,6 @@ outputs: dest: "/" merge: true preserve_properties: true - permissions: - - path: /var/log/swift - owner: swift:swift - recurse: true /var/lib/kolla/config_files/swift_proxy_tls_proxy.json: command: /usr/sbin/httpd -DFOREGROUND config_files: @@ -118,8 +114,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift - - /var/log/containers/httpd/swift-proxy:/var/log/httpd environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - if: @@ -146,16 +140,13 @@ outputs: path: "{{ item }}" state: directory with_items: - - /var/log/containers/swift - - /var/log/containers/httpd/swift-proxy - /srv/node - - name: swift logs readme - copy: - dest: /var/log/swift/readme.txt - content: | - Log files from swift containers can be found under - /var/log/containers/swift and /var/log/containers/httpd/swift-*. - ignore_errors: true + - /var/log/swift + - name: Create swift logging symlink + file: + src: /var/log/swift + dest: /var/log/containers/swift + state: link upgrade_tasks: - name: Stop and disable swift_proxy service tags: step2 diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 1c7eebf24a..09c6c5f507 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -186,10 +186,6 @@ outputs: dest: "/" merge: true preserve_properties: true - permissions: - - path: /var/log/swift - owner: swift:swift - recurse: true /var/lib/kolla/config_files/swift_rsync.json: command: /usr/bin/rsync --daemon --no-detach --config=/etc/rsyncd.conf config_files: @@ -223,7 +219,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: &kolla_env - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS swift_account_reaper: @@ -240,7 +235,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_account_replicator: image: *swift_account_image @@ -256,7 +250,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_account_server: image: *swift_account_image @@ -274,7 +267,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_container_auditor: image: &swift_container_image {get_param: DockerSwiftContainerImage} @@ -290,7 +282,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_container_replicator: image: *swift_container_image @@ -306,7 +297,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_container_updater: image: *swift_container_image @@ -322,7 +312,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_container_server: image: *swift_container_image @@ -340,7 +329,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_object_auditor: image: &swift_object_image {get_param: DockerSwiftObjectImage} @@ -356,7 +344,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_object_expirer: image: &swift_proxy_image {get_param: DockerSwiftProxyImage} @@ -372,7 +359,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_object_replicator: image: *swift_object_image @@ -388,7 +374,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_object_updater: image: *swift_object_image @@ -404,7 +389,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_object_server: image: *swift_object_image @@ -422,7 +406,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_rsync: image: *swift_object_image @@ -439,7 +422,6 @@ outputs: - /run:/run - /srv/node:/srv/node - /dev:/dev - - /var/log/containers/swift:/var/log/swift environment: *kolla_env host_prep_tasks: @@ -448,15 +430,13 @@ outputs: path: "{{ item }}" state: directory with_items: - - /var/log/containers/swift - /srv/node - - name: swift logs readme - copy: - dest: /var/log/swift/readme.txt - content: | - Log files from swift containers can be found under - /var/log/containers/swift and /var/log/containers/httpd/swift-*. - ignore_errors: true + - /var/log/swift + - name: Create swift logging symlink + file: + src: /var/log/swift + dest: /var/log/containers/swift + state: link - name: Format and mount devices defined in SwiftRawDisks mount: name: /srv/node/{{ item }}