Ensure logs folder is created in prep hosts tasks.

We have non fatal errors in the upgrade
jobs execution if the logs folder is not
created when adding the readme.txt file
to clarify the possible locations of
the logs.

Closes-Bug: 1811708
Change-Id: Ibc0a266bdc6630eaf34bfadeff21f7bd72fa75ad

deployment/aodh/aodh-api-container-puppet.yaml

@@ -222,6 +222,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/aodh-api, setype: svirt_sandbox_file_t }
+          - { 'path': /var/log/aodh, setype: svirt_sandbox_file_t }
       - name: aodh logs readme
         copy:
           dest: /var/log/aodh/readme.txt

deployment/aodh/aodh-evaluator-container-puppet.yaml

@@ -112,11 +112,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/aodh
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
         - name: aodh logs readme
           copy:
             dest: /var/log/aodh/readme.txt

deployment/aodh/aodh-listener-container-puppet.yaml

@@ -120,11 +120,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/aodh
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
         - name: aodh logs readme
           copy:
             dest: /var/log/aodh/readme.txt

deployment/aodh/aodh-notifier-container-puppet.yaml

@@ -120,11 +120,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/aodh
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
         - name: aodh logs readme
           copy:
             dest: /var/log/aodh/readme.txt

deployment/glance/glance-api-logging-file-container.yaml

@@ -37,6 +37,7 @@ outputs:
           setype: "{{ item.setype }}"
         with_items:
           - { 'path': /var/log/containers/glance, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/glance, 'setype': svirt_sandbox_file_t }
       - name: glance logs readme
         copy:
           dest: /var/log/glance/readme.txt

deployment/ironic/ironic-api-container-puppet.yaml

@@ -248,7 +248,7 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory
@@ -256,6 +256,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/ironic-api, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ironic, 'setype': svirt_sandbox_file_t }
         - name: ironic logs readme
           copy:
             dest: /var/log/ironic/readme.txt

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -550,6 +550,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/ironic, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ironic, 'setype': svirt_sandbox_file_t }
         - name: ironic logs readme
           copy:
             dest: /var/log/ironic/readme.txt

deployment/ironic/ironic-inspector-container-puppet.yaml

@@ -441,11 +441,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent ironic-inspector logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/ironic-inspector
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/ironic-inspector, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ironic-inspector, 'setype': svirt_sandbox_file_t }
         - name: ironic-inspector logs readme
           copy:
             dest: /var/log/ironic-inspector/readme.txt

deployment/ironic/ironic-pxe-container-puppet.yaml

@@ -165,6 +165,7 @@ outputs:
             - { 'path': /var/lib/ironic, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/ironic-pxe, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ironic, 'setype': svirt_sandbox_file_t }
         - name: ironic logs readme
           copy:
             dest: /var/log/ironic/readme.txt

deployment/keepalived/keepalived-container-puppet.yaml

@@ -147,14 +147,17 @@ outputs:
           vars:
             modules:
               - name: ip_vs
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/keepalived
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/keepalived, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/keepalived, 'setype': svirt_sandbox_file_t }
         - name: keepalived logs readme
           copy:
-            dest: /var/log/keepalived-readme.txt
+            dest: /var/log/keepalived/readme.txt
             content: |
               Log files from keepalived containers can be found under
               /var/log/containers/keepalived.

deployment/memcached/memcached-container-puppet.yaml

@@ -164,9 +164,16 @@ outputs:
                   - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
             command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS']
       host_prep_tasks:
+        - name: create persistent directories
+          file:
+            path: "{{ item.path }}"
+            state: directory
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/memcached, 'setype': svirt_sandbox_file_t }
         - name: memcached logs readme
           copy:
-            dest: /var/log/memcached-readme.txt
+            dest: /var/log/memcached/readme.txt
             content: |
               Memcached container logs to stdout/stderr only.
           ignore_errors: true

deployment/sahara/sahara-api-container-puppet.yaml

@@ -198,14 +198,15 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create /var/lib/sahara
+        - name: create persistent directories
           file:
-            path: /var/lib/sahara
+            path: "{{ item.path }}"
-            state: directory
-        - name: create persistent sahara logs directory
-          file:
-            path: /var/log/containers/sahara
             state: directory
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/sahara, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/lib/sahara, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/sahara, 'setype': svirt_sandbox_file_t }
         - name: sahara logs readme
           copy:
             dest: /var/log/sahara/readme.txt

deployment/sahara/sahara-engine-container-puppet.yaml

@@ -135,14 +135,15 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create /var/lib/sahara
+        - name: create persistent directories
           file:
-            path: /var/lib/sahara
+            path: "{{ item.path }}"
-            state: directory
-        - name: create persistent sahara logs directory
-          file:
-            path: /var/log/containers/sahara
             state: directory
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/sahara, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/lib/sahara, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/sahara, 'setype': svirt_sandbox_file_t }
         - name: sahara logs readme
           copy:
             dest: /var/log/sahara/readme.txt

deployment/zaqar/zaqar-container-puppet.yaml

@@ -346,13 +346,15 @@ outputs:
                 environment:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: "{{ item }}"
+            path: "{{ item.path }}"
             state: directory
+            setype: "{{ item.setype }}"
           with_items:
-            - /var/log/containers/zaqar
+            - { 'path': /var/log/containers/zaqar, 'setype': svirt_sandbox_file_t }
-            - /var/log/containers/httpd/zaqar
+            - { 'path': /var/log/containers/httpd/zaqar, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/zaqar, 'setype': svirt_sandbox_file_t }
         - name: zaqar logs readme
           copy:
             dest: /var/log/zaqar/readme.txt

docker/services/ceilometer-agent-central.yaml

@@ -137,11 +137,14 @@ outputs:
               - 'ceilometer_agent_central'
               - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'"
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/ceilometer
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t }
         - name: ceilometer logs readme
           copy:
             dest: /var/log/ceilometer/readme.txt

docker/services/ceilometer-agent-compute.yaml

@@ -105,11 +105,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/ceilometer
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
         - name: ceilometer logs readme
           copy:
             dest: /var/log/ceilometer/readme.txt

docker/services/ceilometer-agent-ipmi.yaml

@@ -116,11 +116,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/ceilometer
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
         - name: ceilometer logs readme
           copy:
             dest: /var/log/ceilometer/readme.txt

docker/services/ceilometer-agent-notification.yaml

@@ -143,11 +143,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/ceilometer
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
         - name: ceilometer logs readme
           copy:
             dest: /var/log/ceilometer/readme.txt

docker/services/cinder-api.yaml

@@ -209,7 +209,7 @@ outputs:
       metadata_settings:
         get_attr: [CinderBase, role_data, metadata_settings]
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory
@@ -217,6 +217,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/cinder, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/cinder-api, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/cinder, 'setype': svirt_sandbox_file_t }
         - name: cinder logs readme
           copy:
             dest: /var/log/cinder/readme.txt

docker/services/cinder-common.yaml

@@ -66,6 +66,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/cinder, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/lib/cinder, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/cinder, 'setype': svirt_sandbox_file_t }
       - name: cinder logs readme
         copy:
           dest: /var/log/cinder/readme.txt

docker/services/cinder-scheduler.yaml

@@ -141,6 +141,7 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/cinder, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/cinder, 'setype': svirt_sandbox_file_t }
         - name: cinder logs readme
           copy:
             dest: /var/log/cinder/readme.txt

docker/services/congress.yaml

@@ -134,11 +134,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/congress
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/congress, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/congress, 'setype': svirt_sandbox_file_t }
         - name: congress logs readme
           copy:
             dest: /var/log/congress/readme.txt

docker/services/database/mysql.yaml

@@ -231,8 +231,9 @@ outputs:
             state: directory
             setype: "{{ item.setype }}"
           with_items:
-            - {'path':/var/log/containers/mysql, 'setype': 'svirt_sandbox_file_t'}
+            - {'path': /var/log/containers/mysql, 'setype': 'svirt_sandbox_file_t'}
             - {'path': /var/lib/mysql, 'setype': 'svirt_sandbox_file_t'}
+            - {'path': /var/log/mariadb, 'setype': 'svirt_sandbox_file_t'}
         - name: mysql logs readme
           copy:
             dest: /var/log/mariadb/readme.txt

docker/services/database/redis.yaml

@@ -158,6 +158,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/redis, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/run/redis, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/redis, 'setype': svirt_sandbox_file_t }
         - name: redis logs readme
           copy:
             dest: /var/log/redis/readme.txt

docker/services/designate-api.yaml

@@ -139,11 +139,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/designate
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
         - name: designate logs readme
           copy:
             dest: /var/log/designate/readme.txt

docker/services/designate-central.yaml

@@ -157,11 +157,14 @@ outputs:
                   - /var/log/containers/designate:/var/log/designate:z
             command: "/usr/bin/bootstrap_host_exec designate_central su designate -s /bin/bash -c '/bin/designate-manage pool update'"
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/designate
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
         - name: designate logs readme
           copy:
             dest: /var/log/designate/readme.txt

docker/services/designate-mdns.yaml

@@ -119,11 +119,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/designate
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t }
         - name: designate logs readme
           copy:
             dest: /var/log/designate/readme.txt

docker/services/designate-producer.yaml

@@ -120,11 +120,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/designate
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t }
         - name: designate logs readme
           copy:
             dest: /var/log/designate/readme.txt

docker/services/designate-sink.yaml

@@ -120,11 +120,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/designate
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t }
         - name: designate logs readme
           copy:
             dest: /var/log/designate/readme.txt

docker/services/designate-worker.yaml

@@ -161,11 +161,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/designate
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t }
         - name: designate logs readme
           copy:
             dest: /var/log/designate/readme.txt

docker/services/ec2-api.yaml

@@ -205,6 +205,8 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/ec2_api, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/ec2_api_metadata, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ec2_api, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/ec2_api_metadata, 'setype': svirt_sandbox_file_t }            
         - name: ec2_api logs readme
           copy:
             dest: /var/log/{{ item }}/readme.txt

docker/services/fluentd.yaml

@@ -107,11 +107,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory for fluentd
+        - name: create persistent directories
           file:
-            path: /var/log/containers/fluentd
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/fluentd, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/fluentd, 'setype': svirt_sandbox_file_t }
         - name: fluentd logs readme
           copy:
             dest: /var/log/fluentd/readme.txt

docker/services/gnocchi-api.yaml

@@ -236,6 +236,7 @@ outputs:
             - { 'path': /var/log/containers/gnocchi, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/gnocchi-api, 'setype': svirt_sandbox_file_t }
             - { 'path': {get_param: GnocchiFileBasePath}, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/gnocchi, 'setype': svirt_sandbox_file_t }
         - name: gnocchi logs readme
           copy:
             dest: /var/log/gnocchi/readme.txt

docker/services/gnocchi-metricd.yaml

@@ -137,11 +137,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/gnocchi
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/gnocchi, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/gnocchi, 'setype': svirt_sandbox_file_t }
         - name: gnocchi logs readme
           copy:
             dest: /var/log/gnocchi/readme.txt

docker/services/gnocchi-statsd.yaml

@@ -137,11 +137,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/gnocchi
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/gnocchi, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/gnocchi, 'setype': svirt_sandbox_file_t }
         - name: gnocchi logs readme
           copy:
             dest: /var/log/gnocchi/readme.txt

docker/services/haproxy.yaml

@@ -326,6 +326,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/haproxy, 'setype': var_log_t }
             - { 'path': /var/lib/haproxy, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/haproxy, 'setype': svirt_sandbox_file_t }
         - name: haproxy logs readme
           copy:
             dest: /var/log/haproxy/readme.txt

docker/services/horizon.yaml

@@ -167,7 +167,7 @@ outputs:
               - ENABLE_ZAQAR=no
               - ENABLE_ZUN=no
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory
@@ -176,6 +176,7 @@ outputs:
             - { 'path': /var/log/containers/horizon, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/horizon, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/www, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/horizon, 'setype': svirt_sandbox_file_t }
         - name: horizon logs readme
           copy:
             dest: /var/log/horizon/readme.txt

docker/services/logging/files/barbican-api.yaml

@@ -32,7 +32,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -40,6 +40,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/barbican, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/barbican-api, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/barbican, 'setype': svirt_sandbox_file_t }
       - name: barbican logs readme
         copy:
           dest: /var/log/barbican/readme.txt

docker/services/logging/files/heat-api-cfn.yaml

@@ -19,7 +19,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -27,6 +27,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/heat-api-cfn, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/heat, 'setype': svirt_sandbox_file_t }
       - name: heat logs readme
         copy:
           dest: /var/log/heat/readme.txt

docker/services/logging/files/heat-api.yaml

@@ -19,7 +19,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -27,6 +27,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/heat-api, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/heat, 'setype': svirt_sandbox_file_t }
       - name: heat logs readme
         copy:
           dest: /var/log/heat/readme.txt

docker/services/logging/files/heat-engine.yaml

@@ -33,11 +33,14 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
-          path: /var/log/containers/heat
+          path: "{{ item.path }}"
           state: directory
-          setype: svirt_sandbox_file_t
+          setype: "{{ item.setype }}"
+        with_items:
+          - { 'path': /var/log/containers/heat, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/heat, 'setype': svirt_sandbox_file_t }
       - name: heat logs readme
         copy:
           dest: /var/log/heat/readme.txt

docker/services/logging/files/keystone.yaml

@@ -33,7 +33,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -41,6 +41,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/keystone, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/keystone, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/keystone, 'setype': svirt_sandbox_file_t }
       - name: keystone logs readme
         copy:
           dest: /var/log/keystone/readme.txt

docker/services/logging/files/neutron-api.yaml

@@ -41,7 +41,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -49,6 +49,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/neutron, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/neutron-api, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/neutron, 'setype': svirt_sandbox_file_t }
       - name: neutron logs readme
         copy:
           dest: /var/log/neutron/readme.txt

docker/services/logging/files/neutron-common.yaml

@@ -30,13 +30,14 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
         with_items:
           - { 'path': /var/log/containers/neutron, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/neutron, 'setype': svirt_sandbox_file_t }
       - name: neutron logs readme
         copy:
           dest: /var/log/neutron/readme.txt

docker/services/logging/files/nova-api.yaml

@@ -31,7 +31,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           setype: "{{ item.setype }}"
@@ -39,6 +39,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/nova-api, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/nova, 'setype': svirt_sandbox_file_t }
       - name: nova logs readme
         copy:
           dest: /var/log/nova/readme.txt

docker/services/logging/files/nova-common.yaml

@@ -51,11 +51,14 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
-          path: /var/log/containers/nova
+          path: "{{ item.path }}"
+          setype: "{{ item.setype }}"
           state: directory
-          setype: svirt_sandbox_file_t
+        with_items:
+          - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/nova, 'setype': svirt_sandbox_file_t }
       - name: nova logs readme
         copy:
           dest: /var/log/nova/readme.txt

docker/services/logging/files/nova-metadata.yaml

@@ -30,7 +30,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -38,6 +38,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/nova-metadata, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/nova, 'setype': svirt_sandbox_file_t }
       - name: nova logs readme
         copy:
           dest: /var/log/nova/readme.txt

docker/services/logging/files/nova-placement.yaml

@@ -30,7 +30,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -38,6 +38,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/nova-placement, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/nova, 'setype': svirt_sandbox_file_t }
       - name: nova logs readme
         copy:
           dest: /var/log/nova/readme.txt

docker/services/logging/files/opendaylight-api.yaml

@@ -17,7 +17,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory

docker/services/logging/files/panko-api.yaml

@@ -32,7 +32,7 @@ outputs:
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -40,6 +40,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/panko, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/log/containers/httpd/panko-api, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/panko, 'setype': svirt_sandbox_file_t }
       - name: panko logs readme
         copy:
           dest: /var/log/panko/readme.txt

docker/services/manila-api.yaml

@@ -122,7 +122,7 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: Create persistent manila logs directory
+        - name: Create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory
@@ -130,6 +130,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/manila-api, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/manila, 'setype': svirt_sandbox_file_t }
         - name: manila logs readme
           copy:
             dest: /var/log/manila/readme.txt

docker/services/manila-scheduler.yaml

@@ -107,11 +107,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: Create persistent manila logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/manila
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/manila, 'setype': svirt_sandbox_file_t }
         - name: manila logs readme
           copy:
             dest: /var/log/manila/readme.txt

docker/services/manila-share.yaml

@@ -128,6 +128,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/manila, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/manila, 'setype': svirt_sandbox_file_t }
         - name: manila logs readme
           copy:
             dest: /var/log/manila/readme.txt

docker/services/messaging/notify-rabbitmq.yaml

@@ -217,6 +217,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
         - name: rabbitmq logs readme
           copy:
             dest: /var/log/rabbitmq/readme.txt

docker/services/messaging/rpc-rabbitmq.yaml

@@ -217,6 +217,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
         - name: rabbitmq logs readme
           copy:
             dest: /var/log/rabbitmq/readme.txt

docker/services/metrics/collectd.yaml

@@ -114,11 +114,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/collectd
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/collectd, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/collectd, 'setype': svirt_sandbox_file_t }
         - name: collectd logs readme
           copy:
             dest: /var/log/collectd/readme.txt

docker/services/mistral-api.yaml

@@ -151,11 +151,14 @@ outputs:
             # the Mistral API image so that we get tripleo* actions
             command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf populate'"
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/mistral
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
         - name: mistral logs readme
           copy:
             dest: /var/log/mistral/readme.txt

docker/services/mistral-engine.yaml

@@ -121,11 +121,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/mistral
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
         - name: mistral logs readme
           copy:
             dest: /var/log/mistral/readme.txt

docker/services/mistral-event-engine.yaml

@@ -121,11 +121,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/mistral
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
         - name: mistral logs readme
           copy:
             dest: /var/log/mistral/readme.txt

docker/services/mistral-executor.yaml

@@ -176,7 +176,7 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent data directory
+        - name: create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory
@@ -184,6 +184,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/mistral, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
         - name: mistral logs readme
           copy:
             dest: /var/log/mistral/readme.txt

docker/services/nova-ironic.yaml

@@ -155,6 +155,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/nova, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/nova, 'setype': svirt_sandbox_file_t }
         - name: nova logs readme
           copy:
             dest: /var/log/nova/readme.txt

docker/services/novajoin.yaml

@@ -219,6 +219,7 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/novajoin, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/novajoin, 'setype': svirt_sandbox_file_t }
         - name: novajoin logs readme
           copy:
             dest: /var/log/novajoin/readme.txt

docker/services/octavia-api.yaml

@@ -207,7 +207,7 @@ outputs:
                       - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
                 - {}
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory
@@ -215,6 +215,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/httpd/octavia-api, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
         - name: octavia logs readme
           copy:
             dest: /var/log/octavia/readme.txt

docker/services/octavia-health-manager.yaml

@@ -133,11 +133,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/octavia
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
         - name: octavia logs readme
           copy:
             dest: /var/log/octavia/readme.txt

docker/services/octavia-housekeeping.yaml

@@ -129,11 +129,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/octavia
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
         - name: octavia logs readme
           copy:
             dest: /var/log/octavia/readme.txt

docker/services/octavia-worker.yaml

@@ -141,11 +141,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/octavia
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
         - name: octavia logs readme
           copy:
             dest: /var/log/octavia/readme.txt

docker/services/ovn-controller.yaml

@@ -126,11 +126,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/openvswitch
+            path: "{{ item.path }}"
             state: directory
-            setype: svirt_sandbox_file_t
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/openvswitch, 'setype': svirt_sandbox_file_t }
         - name: openvswitch logs readme
           copy:
             dest: /var/log/openvswitch/readme.txt

docker/services/ovn-dbs.yaml

@@ -198,6 +198,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/openvswitch, 'setype': svirt_sandbox_file_t }
         - name: openvswitch logs readme
           copy:
             dest: /var/log/openvswitch/readme.txt

docker/services/pacemaker/database/mysql.yaml

@@ -294,8 +294,9 @@ outputs:
             state: directory
             setype: "{{ item.setype }}"
           with_items:
-            - {'path':/var/log/containers/mysql, 'setype': 'svirt_sandbox_file_t'}
+            - {'path': /var/log/containers/mysql, 'setype': 'svirt_sandbox_file_t'}
             - {'path': /var/lib/mysql, 'setype': 'svirt_sandbox_file_t'}
+            - {'path': /var/log/mariadb, 'setype': 'svirt_sandbox_file_t'}
         - name: mysql logs readme
           copy:
             dest: /var/log/mariadb/readme.txt

docker/services/pacemaker/database/redis.yaml

@@ -277,6 +277,7 @@ outputs:
             - { 'path': /var/lib/redis, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/redis, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/run/redis, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/redis, 'setype': svirt_sandbox_file_t }
         - name: redis logs readme
           copy:
             dest: /var/log/redis/readme.txt

docker/services/pacemaker/haproxy.yaml

@@ -324,6 +324,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/haproxy, 'setype': var_log_t }
             - { 'path': /var/lib/haproxy, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/haproxy, 'setype': svirt_sandbox_file_t }
         - name: haproxy logs readme
           copy:
             dest: /var/log/haproxy/readme.txt

docker/services/pacemaker/manila-share.yaml

@@ -201,6 +201,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/manila, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/manila, 'setype': svirt_sandbox_file_t }
         - name: manila logs readme
           copy:
             dest: /var/log/manila/readme.txt

docker/services/pacemaker/notify-rabbitmq.yaml

@@ -244,6 +244,7 @@ outputs:
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
         - name: rabbitmq logs readme
           copy:
             dest: /var/log/rabbitmq/readme.txt

docker/services/pacemaker/ovn-dbs.yaml

@@ -187,6 +187,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/openvswitch, 'setype': svirt_sandbox_file_t }
         - name: openvswitch logs readme
           copy:
             dest: /var/log/openvswitch/readme.txt

docker/services/pacemaker/rabbitmq.yaml

@@ -243,6 +243,7 @@ outputs:
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
         - name: rabbitmq logs readme
           copy:
             dest: /var/log/rabbitmq/readme.txt

docker/services/pacemaker/rpc-rabbitmq.yaml

@@ -246,6 +246,7 @@ outputs:
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
         - name: rabbitmq logs readme
           copy:
             dest: /var/log/rabbitmq/readme.txt

docker/services/qdrouterd.yaml

@@ -107,7 +107,7 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-      - name: create persistent logs directory
+      - name: create persistent directories
         file:
           path: "{{ item.path }}"
           state: directory
@@ -115,6 +115,7 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/lib/qdrouterd, 'setype': svirt_sandbox_file_t }
+          - { 'path': /var/log/qdrouterd, 'setype': svirt_sandbox_file_t }
       - name: qrouterd logs readme
         copy:
           dest: /var/log/qrouterd/readme.txt

docker/services/rabbitmq.yaml

@@ -216,6 +216,7 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
         - name: rabbitmq logs readme
           copy:
             dest: /var/log/rabbitmq/readme.txt

docker/services/sensu-client.yaml

@@ -163,10 +163,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/sensu
+            path: "{{ item.path }}"
             state: directory
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/sensu, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/sensu, 'setype': svirt_sandbox_file_t }
         - name: sensu logs readme
           copy:
             dest: /var/log/sensu/readme.txt

docker/services/tacker.yaml

@@ -131,10 +131,14 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
-            path: /var/log/containers/tacker
+            path: "{{ item.path }}"
             state: directory
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/tacker, 'setype': svirt_sandbox_file_t }
+            - { 'path': /var/log/containers/tacker, 'setype': svirt_sandbox_file_t }
         - name: tacker logs readme
           copy:
             dest: /var/log/tacker/readme.txt

docker/services/tempest.yaml

@@ -56,7 +56,7 @@ outputs:
               - /var/lib/tempestdata:/var/lib/tempest:z
             command: ['/bin/bash', '-c', 'chown -R tempest:tempest /var/log/tempest /var/lib/tempest']
       host_prep_tasks:
-        - name: create persistent logs directory
+        - name: create persistent directories
           file:
             path: "{{ item.path }}"
             state: directory