Merge "Ensure persistence for containerized rsyslog state"

deployment/logging/rsyslog-container-puppet.yaml

@@ -212,6 +212,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/rsyslog/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers:/var/log/containers:ro
                   - /var/log/containers/rsyslog:/var/log/rsyslog:rw,z
+                  - /var/lib/rsyslog.container:/var/lib/rsyslog:rw,z
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
@@ -220,10 +221,16 @@ outputs:
             path: /var/log/containers/rsyslog
             state: directory
             setype: svirt_sandbox_file_t
+        - name: create persistent state directory for rsyslog
+          file:
+            path: /var/lib/rsyslog.container
+            state: directory
+            setype: svirt_sandbox_file_t
         - name: rsyslog logs readme
           copy:
             dest: /var/log/rsyslog/readme.txt
             content: |
               Log files from rsyslog containers can be found under
-              /var/log/containers/rsyslog.
+              /var/log/containers/rsyslog. And its state is stored
+              under /var/lib/rsyslog.container.
           ignore_errors: true