Merge "Only configure rsyslog when present"

docker/services/swift-proxy.yaml

@@ -253,18 +253,24 @@ 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
+        - name: Check if rsyslog exists
+          stat:
+            path: /etc/rsyslog.d
+          register: rsyslog_config
+        - block:
+            - 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
+          when: rsyslog_config.stat.exists
       upgrade_tasks:
         - when: step|int == 0
           tags: common

docker/services/swift-storage.yaml

@@ -468,18 +468,24 @@ 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
-        - name: Restart rsyslogd service after logging conf change
-          service: name=rsyslog state=restarted
-          when:
-            - logconfig|changed
+        - name: Check if rsyslog exists
+          stat:
+            path: /etc/rsyslog.d
+          register: rsyslog_config
+        - block:
+            - 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
+          when: rsyslog_config.stat.exists
         - name: Set fact for SwiftRawDisks
           set_fact:
             swift_raw_disks: {get_param: SwiftRawDisks}