Merge "Update rsyslog existence check"

docker/services/swift-proxy.yaml

@@ -254,9 +254,9 @@ outputs:
             dest: /var/log/containers/swift
             state: link
         - name: Check if rsyslog exists
-          stat:
-            path: /etc/rsyslog.d
+          shell: systemctl list-unit-files --type=service | grep -q rsyslog
           register: rsyslog_config
+          failed_when: rsyslog_config.rc == 2
         - block:
             - name: Forward logging to swift.log file
               copy:
@@ -270,7 +270,7 @@ outputs:
               service: name=rsyslog state=restarted
               when:
                 - logconfig|changed
-          when: rsyslog_config.stat.exists
+          when: rsyslog_config.rc == 0
       upgrade_tasks:
         - when: step|int == 0
           tags: common

docker/services/swift-storage.yaml

@@ -469,9 +469,9 @@ outputs:
               /var/log/containers/swift and /var/log/containers/httpd/swift-*.
           ignore_errors: true
         - name: Check if rsyslog exists
-          stat:
-            path: /etc/rsyslog.d
+          shell: systemctl list-unit-files --type=service | grep -q rsyslog
           register: rsyslog_config
+          failed_when: rsyslog_config.rc == 2
         - block:
             - name: Forward logging to swift.log file
               copy:
@@ -485,7 +485,7 @@ outputs:
               service: name=rsyslog state=restarted
               when:
                 - logconfig|changed
-          when: rsyslog_config.stat.exists
+          when: rsyslog_config.rc == 0
         - name: Set fact for SwiftRawDisks
           set_fact:
             swift_raw_disks: {get_param: SwiftRawDisks}