Merge "Add host_prep_task to setup proper logging for Swift"

docker/services/swift-proxy.yaml

@@ -253,6 +253,18 @@ outputs:
             src: /var/log/swift
             dest: /var/log/containers/swift
             state: link
+        - name: Forward logging to swift.log file
+          copy:
+            content: |
+              # Fix for https://bugs.launchpad.net/tripleo/+bug/1776180
+              local2.*                 /var/log/swift/swift.log
+              &                        stop
+            dest: /etc/rsyslog.d/openstack-swift.conf
+          register: logconfig
+        - name: Restart rsyslogd service after logging conf change
+          service: name=rsyslog state=restarted
+          when:
+            - logconfig|changed
       upgrade_tasks:
         - when: step|int == 0
           tags: common

docker/services/swift-storage.yaml

@@ -468,6 +468,18 @@ outputs:
               Log files from swift containers can be found under
               /var/log/containers/swift and /var/log/containers/httpd/swift-*.
           ignore_errors: true
+        - name: Forward logging to swift.log file
+          copy:
+            content: |
+              # Fix for https://bugs.launchpad.net/tripleo/+bug/1776180
+              local2.*                 /var/log/swift/swift.log
+              &                        stop
+            dest: /etc/rsyslog.d/openstack-swift.conf
+          register: logconfig_changed
+        - name: Restart rsyslogd service after logging conf change
+          service: name=rsyslog state=restarted
+          when:
+            - logconfig|changed
         - name: Format SwiftRawDisks
           filesystem:
             fstype: xfs