Replace /var/log/containers/swift symlink with directories

Once we remove the symlinks in update_staks, host_prep_tasks
would create those directories.

Assuming that minor update runs before upgrades, this should
take care of upgrades too.

Change-Id: Idabfec5f568a4e02900d103d23f4cb3c199e84c9
Related-Bug: #1833690

deployment/swift/swift-proxy-container-puppet.yaml

@@ -459,6 +459,16 @@ outputs:
               when:
                 - logconfig is changed
           when: rsyslog_config.rc == 0
+      update_tasks:
+        - name: Check swift containers log folder/symlink exists
+          stat:
+            path: /var/log/containers/swift
+          register: swift_log_link
+        - name: Delete if symlink
+          file:
+            path: /var/log/containers/swift
+            state: absent
+          when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
       metadata_settings:
         get_attr: [TLSProxyBase, role_data, metadata_settings]
       post_upgrade_tasks:

deployment/swift/swift-storage-container-puppet.yaml

@@ -648,6 +648,15 @@ outputs:
           file:
             path: /var/run/rsyncd.pid
             state: absent
+        - name: Check swift containers log folder/symlink exists
+          stat:
+            path: /var/log/containers/swift
+          register: swift_log_link
+        - name: Delete if symlink
+          file:
+            path: /var/log/containers/swift
+            state: absent
+          when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
       post_upgrade_tasks:
         - when: step|int == 1
           import_role: