Merge "Drop legacy log folder and readme"

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

@@ -223,14 +223,6 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/aodh-api, setype: svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/aodh, setype: svirt_sandbox_file_t }
-      - name: aodh logs readme
-        copy:
-          dest: /var/log/aodh/readme.txt
-          content: |
-            Log files from aodh containers can be found under
-            /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
-        ignore_errors: true
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       post_upgrade_tasks:

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

@@ -115,14 +115,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
-        - name: aodh logs readme
-          copy:
-            dest: /var/log/aodh/readme.txt
-            content: |
-              Log files from aodh containers can be found under
-              /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -115,14 +115,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
-        - name: aodh logs readme
-          copy:
-            dest: /var/log/aodh/readme.txt
-            content: |
-              Log files from aodh containers can be found under
-              /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -116,13 +116,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t }
-        - name: aodh logs readme
-          copy:
-            dest: /var/log/aodh/readme.txt
-            content: |
-              Log files from aodh containers can be found under
-              /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml

@@ -150,15 +150,7 @@ outputs:
             state: directory
             setype: "{{ item.setype }}"
           with_items:
-            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-        - name: ceilometer logs readme
-          copy:
-            dest: /var/log/ceilometer/readme.txt
-            content: |
-              Log files from ceilometer containers can be found under
-              /var/log/containers/ceilometer.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

@@ -120,14 +120,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
-        - name: ceilometer logs readme
-          copy:
-            dest: /var/log/ceilometer/readme.txt
-            content: |
-              Log files from ceilometer containers can be found under
-              /var/log/containers/ceilometer.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

@@ -138,14 +138,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
-        - name: ceilometer logs readme
-          copy:
-            dest: /var/log/ceilometer/readme.txt
-            content: |
-              Log files from ceilometer containers can be found under
-              /var/log/containers/ceilometer.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@@ -125,14 +125,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/ceilometer, 'setype': svirt_sandbox_file_t }
-        - name: ceilometer logs readme
-          copy:
-            dest: /var/log/ceilometer/readme.txt
-            content: |
-              Log files from ceilometer containers can be found under
-              /var/log/containers/ceilometer.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

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

@@ -343,14 +343,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/cinder, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/cinder-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/cinder, 'setype': svirt_sandbox_file_t }
-        - name: cinder logs readme
-          copy:
-            dest: /var/log/cinder/readme.txt
-            content: |
-              Log files from cinder containers can be found under
-              /var/log/containers/cinder and /var/log/containers/httpd/cinder-api.
-          ignore_errors: true
       external_upgrade_tasks:
         - when: step|int == 1
           block:

deployment/cinder/cinder-common-container-puppet.yaml

@@ -74,14 +74,6 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/cinder, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { '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
-          content: |
-            Log files from cinder containers can be found under
-            /var/log/containers/cinder and /var/log/containers/httpd/cinder-api.
-        ignore_errors: true
       - name: ensure ceph configurations exist
         file:
           path: /etc/ceph

deployment/cinder/cinder-scheduler-container-puppet.yaml

@@ -136,14 +136,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/cinder, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/cinder, 'setype': svirt_sandbox_file_t }
-        - name: cinder logs readme
-          copy:
-            dest: /var/log/cinder/readme.txt
-            content: |
-              Log files from cinder containers can be found under
-              /var/log/containers/cinder and /var/log/containers/httpd/cinder-api.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/database/mysql-container-puppet.yaml

@@ -243,14 +243,6 @@ outputs:
           with_items:
             - {'path': /var/log/containers/mysql, 'setype': 'svirt_sandbox_file_t', 'mode': '0750'}
             - {'path': /var/lib/mysql, 'setype': 'svirt_sandbox_file_t'}
-            - {'path': /var/log/mariadb, 'setype': 'svirt_sandbox_file_t', 'mode': '0750'}
-        - name: mysql logs readme
-          copy:
-            dest: /var/log/mariadb/readme.txt
-            content: |
-              Log files from mysql containers can be found under
-              /var/log/containers/mysql.
-          ignore_errors: true
       upgrade_tasks:
           # LP 1810136
           # After upgrade, the new mariadb (e.g. 10.3) might not be able

deployment/database/mysql-pacemaker-puppet.yaml

@@ -303,14 +303,6 @@ outputs:
           with_items:
             - {'path': /var/log/containers/mysql, 'setype': 'svirt_sandbox_file_t', 'mode': '0750'}
             - {'path': /var/lib/mysql, 'setype': 'svirt_sandbox_file_t'}
-            - {'path': /var/log/mariadb, 'setype': 'svirt_sandbox_file_t', 'mode': '0750'}
-        - name: mysql logs readme
-          copy:
-            dest: /var/log/mariadb/readme.txt
-            content: |
-              Log files from mysql containers can be found under
-              /var/log/containers/mysql.
-          ignore_errors: true
       metadata_settings:
         get_attr: [MysqlBase, role_data, metadata_settings]
       deploy_steps_tasks:

deployment/database/redis-container-puppet.yaml

@@ -221,19 +221,11 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/redis, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/run/redis, 'setype': svirt_sandbox_file_t }
-            - { 'path': /var/log/redis, 'setype': svirt_sandbox_file_t }
         - name: ensure /var/run/redis is present upon reboot
           copy:
             dest: /etc/tmpfiles.d/var-run-redis.conf
             content: |
               d /var/run/redis 0755 root root - -
-        - name: redis logs readme
-          copy:
-            dest: /var/log/redis/readme.txt
-            content: |
-              Log files from redis containers can be found under
-              /var/log/containers/redis.
-          ignore_errors: true
       update_tasks:
         - name: Ensure redis is uninstalled on container host
           when: step|int == 1

deployment/database/redis-pacemaker-puppet.yaml

@@ -280,19 +280,11 @@ outputs:
             - { 'path': /var/lib/redis, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/redis, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/run/redis, 'setype': svirt_sandbox_file_t }
-            - { 'path': /var/log/redis, 'setype': svirt_sandbox_file_t }
         - name: ensure /var/run/redis is present upon reboot
           copy:
             dest: /etc/tmpfiles.d/var-run-redis.conf
             content: |
               d /var/run/redis 0755 root root - -
-        - name: redis logs readme
-          copy:
-            dest: /var/log/redis/readme.txt
-            content: |
-              Log files from redis containers can be found under
-              /var/log/containers/redis.
-          ignore_errors: true
       deploy_steps_tasks:
         - name: Redis tag container image for pacemaker
           when: step|int == 1

deployment/experimental/designate/designate-api-container-puppet.yaml

@@ -161,14 +161,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
-        - name: designate logs readme
-          copy:
-            dest: /var/log/designate/readme.txt
-            content: |
-              Log files from designate containers can be found under
-              /var/log/containers/designate.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/experimental/designate/designate-central-container-puppet.yaml

@@ -211,14 +211,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
-        - name: designate logs readme
-          copy:
-            dest: /var/log/designate/readme.txt
-            content: |
-              Log files from designate containers can be found under
-              /var/log/containers/designate.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/experimental/designate/designate-mdns-container-puppet.yaml

@@ -178,13 +178,6 @@ outputs:
           with_items:
             - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-        - name: designate logs readme
-          copy:
-            dest: /var/log/designate/readme.txt
-            content: |
-              Log files from designate containers can be found under
-              /var/log/containers/designate.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/experimental/designate/designate-producer-container-puppet.yaml

@@ -133,15 +133,7 @@ outputs:
             state: directory
             setype: "{{ item.setype }}"
           with_items:
-            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-        - name: designate logs readme
-          copy:
-            dest: /var/log/designate/readme.txt
-            content: |
-              Log files from designate containers can be found under
-              /var/log/containers/designate.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/experimental/designate/designate-sink-container-puppet.yaml

@@ -125,15 +125,7 @@ outputs:
             state: directory
             setype: "{{ item.setype }}"
           with_items:
-            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-        - name: designate logs readme
-          copy:
-            dest: /var/log/designate/readme.txt
-            content: |
-              Log files from designate containers can be found under
-              /var/log/containers/designate.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/experimental/designate/designate-worker-container-puppet.yaml

@@ -226,15 +226,7 @@ outputs:
             state: directory
             setype: "{{ item.setype }}"
           with_items:
-            - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-        - name: designate logs readme
-          copy:
-            dest: /var/log/designate/readme.txt
-            content: |
-              Log files from designate containers can be found under
-              /var/log/containers/designate.
-          ignore_errors: true
         - name: create persistent named directory
           file:
             path: /var/named-persistent

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

@@ -38,11 +38,3 @@ outputs:
           setype: "{{ item.setype }}"
         with_items:
           - { 'path': /var/log/containers/glance, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/glance, 'setype': svirt_sandbox_file_t }
-      - name: glance logs readme
-        copy:
-          dest: /var/log/glance/readme.txt
-          content: |
-            Log files from glance containers can be found under
-            /var/log/containers/glance.
-        ignore_errors: true

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

@@ -357,14 +357,6 @@ outputs:
             - { 'path': /var/log/containers/gnocchi, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/gnocchi-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from gnocchi containers can be found under
-              /var/log/containers/gnocchi and /var/log/containers/httpd/gnocchi-api.
-          ignore_errors: true
         - name: ensure ceph configurations exist
           file:
             path: /etc/ceph

deployment/gnocchi/gnocchi-metricd-container-puppet.yaml

@@ -160,14 +160,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/gnocchi, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/gnocchi, 'setype': svirt_sandbox_file_t }
-        - name: gnocchi logs readme
-          copy:
-            dest: /var/log/gnocchi/readme.txt
-            content: |
-              Log files from gnocchi containers can be found under
-              /var/log/containers/gnocchi and /var/log/containers/httpd/gnocchi-api.
-          ignore_errors: true
         - name: create persistent data directory
           file:
             path: {get_param: GnocchiFileBasePath}

deployment/gnocchi/gnocchi-statsd-container-puppet.yaml

@@ -154,14 +154,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/gnocchi, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/gnocchi, 'setype': svirt_sandbox_file_t }
-        - name: gnocchi logs readme
-          copy:
-            dest: /var/log/gnocchi/readme.txt
-            content: |
-              Log files from gnocchi containers can be found under
-              /var/log/containers/gnocchi and /var/log/containers/httpd/gnocchi-api.
-          ignore_errors: true
         - name: create persistent data directory
           file:
             path: {get_param: GnocchiFileBasePath}

deployment/haproxy/haproxy-container-puppet.yaml

@@ -374,14 +374,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/haproxy, 'setype': var_log_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from the haproxy containers can be found under
-              /var/log/containers/haproxy.
-          ignore_errors: true
       metadata_settings:
         list_concat:
           - {get_attr: [HAProxyPublicTLS, role_data, metadata_settings]}

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -287,13 +287,6 @@ outputs:
               TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - {get_attr: [HAProxyBase, role_data, host_prep_tasks]}
-        - name: haproxy logs readme
-          copy:
-            dest: /var/log/haproxy/readme.txt
-            content: |
-              Log files from the haproxy containers can be found under
-              /var/log/containers/haproxy.
-          ignore_errors: true
         - name: create persistent directories
           file:
             path: "{{ item.path }}"

deployment/horizon/horizon-container-puppet.yaml

@@ -322,14 +322,6 @@ outputs:
             - { 'path': /var/log/containers/horizon, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/horizon, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from horizon containers can be found under
-              /var/log/containers/horizon and /var/log/containers/httpd/horizon.
-          ignore_errors: true
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1

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

@@ -269,14 +269,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/ironic-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/ironic, 'setype': svirt_sandbox_file_t }
-        - name: ironic logs readme
-          copy:
-            dest: /var/log/ironic/readme.txt
-            content: |
-              Log files from ironic containers can be found under
-              /var/log/containers/ironic and /var/log/containers/httpd/ironic-*.
-          ignore_errors: true
       external_upgrade_tasks:
         - when: step|int == 1
           block:

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

@@ -556,14 +556,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from ironic containers can be found under
-              /var/log/containers/ironic and /var/log/containers/httpd/ironic-*.
-          ignore_errors: true
         - name: stat /httpboot
           stat: path=/httpboot
           register: stat_httpboot

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

@@ -480,14 +480,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/ironic-inspector, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/ironic-inspector, 'setype': svirt_sandbox_file_t }
-        - name: ironic-inspector logs readme
-          copy:
-            dest: /var/log/ironic-inspector/readme.txt
-            content: |
-              Log files from ironic-inspector container can be found under
-              /var/log/containers/ironic-inspector.
-          ignore_errors: true
         - name: create persistent ironic-inspector dnsmasq dhcp hostsdir
           file:
             path: /var/lib/ironic-inspector/dhcp-hostsdir

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

@@ -156,14 +156,6 @@ outputs:
             - { 'path': /var/lib/ironic, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/ironic-pxe, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/ironic, 'setype': svirt_sandbox_file_t }
-        - name: ironic logs readme
-          copy:
-            dest: /var/log/ironic/readme.txt
-            content: |
-              Log files from ironic containers can be found under
-              /var/log/containers/ironic and /var/log/containers/httpd/ironic-*.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/keepalived/keepalived-container-puppet.yaml

@@ -150,14 +150,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/keepalived, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/keepalived, 'setype': svirt_sandbox_file_t }
-        - name: keepalived logs readme
-          copy:
-            dest: /var/log/keepalived/readme.txt
-            content: |
-              Log files from keepalived containers can be found under
-              /var/log/containers/keepalived.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/logging/files/barbican-api.yaml

@@ -41,11 +41,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/barbican, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/barbican-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/barbican, 'setype': var_log_t }
-      - name: barbican logs readme
-        copy:
-          dest: /var/log/barbican/readme.txt
-          content: |
-            Log files from barbican containers can be found under
-            /var/log/containers/barbican.
-        ignore_errors: true

deployment/logging/files/heat-api-cfn.yaml

@@ -27,11 +27,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/heat-api-cfn, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/heat, 'setype': var_log_t }
-      - name: heat logs readme
-        copy:
-          dest: /var/log/heat/readme.txt
-          content: |
-            Log files from heat containers can be found under
-            /var/log/containers/heat and /var/log/containers/httpd/heat-api*.
-        ignore_errors: true

deployment/logging/files/heat-api.yaml

@@ -27,11 +27,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/heat-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/heat, 'setype': var_log_t }
-      - name: heat logs readme
-        copy:
-          dest: /var/log/heat/readme.txt
-          content: |
-            Log files from heat containers can be found under
-            /var/log/containers/heat and /var/log/containers/httpd/heat-api*.
-        ignore_errors: true

deployment/logging/files/heat-engine.yaml

@@ -41,11 +41,3 @@ outputs:
           setype: "{{ item.setype }}"
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/heat, 'setype': var_log_t }
-      - name: heat logs readme
-        copy:
-          dest: /var/log/heat/readme.txt
-          content: |
-            Log files from heat containers can be found under
-            /var/log/containers/heat and /var/log/containers/httpd/heat-api*.
-        ignore_errors: true

deployment/logging/files/keystone.yaml

@@ -42,11 +42,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/keystone, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/keystone, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/keystone, 'setype': var_log_t }
-      - name: keystone logs readme
-        copy:
-          dest: /var/log/keystone/readme.txt
-          content: |
-            Log files from keystone containers can be found under
-            /var/log/containers/keystone and /var/log/containers/httpd/keystone.
-        ignore_errors: true

deployment/logging/files/neutron-api.yaml

@@ -50,11 +50,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/neutron, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/neutron-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/neutron, 'setype': var_log_t }
-      - name: neutron logs readme
-        copy:
-          dest: /var/log/neutron/readme.txt
-          content: |
-            Log files from neutron containers can be found under
-            /var/log/containers/neutron and /var/log/containers/httpd/neutron-api.
-        ignore_errors: true

deployment/logging/files/neutron-common.yaml

@@ -37,11 +37,3 @@ outputs:
           setype: "{{ item.setype }}"
         with_items:
           - { 'path': /var/log/containers/neutron, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/neutron, 'setype': var_log_t, 'mode': '0750' }
-      - name: neutron logs readme
-        copy:
-          dest: /var/log/neutron/readme.txt
-          content: |
-            Log files from neutron containers can be found under
-            /var/log/containers/neutron and /var/log/containers/httpd/neutron-api.
-        ignore_errors: true

deployment/logging/files/nova-api.yaml

@@ -50,11 +50,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/nova-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/nova, 'setype': var_log_t }
-      - name: nova logs readme
-        copy:
-          dest: /var/log/nova/readme.txt
-          content: |
-            Log files from nova containers can be found under
-            /var/log/containers/nova and /var/log/containers/httpd/nova-*.
-        ignore_errors: true

deployment/logging/files/nova-common.yaml

@@ -69,11 +69,3 @@ outputs:
           state: directory
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/nova, 'setype': var_log_t }
-      - name: nova logs readme
-        copy:
-          dest: /var/log/nova/readme.txt
-          content: |
-            Log files from nova containers can be found under
-            /var/log/containers/nova and /var/log/containers/httpd/nova-*.
-        ignore_errors: true

deployment/logging/files/nova-libvirt.yaml

@@ -39,10 +39,3 @@ outputs:
           state: directory
         with_items:
           - { 'path': /var/log/containers/libvirt, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-      - name: libvirt logs readme
-        copy:
-          dest: /var/log/libvirt/readme.txt
-          content: |
-            Log files from libvirt containers can be found under
-            /var/log/containers/libvirt.
-        ignore_errors: true

deployment/logging/files/nova-metadata.yaml

@@ -39,11 +39,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/nova-metadata, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/nova, 'setype': var_log_t }
-      - name: nova logs readme
-        copy:
-          dest: /var/log/nova/readme.txt
-          content: |
-            Log files from nova containers can be found under
-            /var/log/containers/nova and /var/log/containers/httpd/nova-*.
-        ignore_errors: true

deployment/logging/files/placement-api.yaml

@@ -39,11 +39,3 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/placement, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/placement, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-          - { 'path': /var/log/placement, 'setype': var_log_t }
-      - name: Placement logs readme
-        copy:
-          dest: /var/log/placement/readme.txt
-          content: |
-            Log files from placement containers can be found under
-            /var/log/containers/placement and /var/log/containers/httpd/placement*.
-        ignore_errors: true

deployment/logging/rsyslog-container-puppet.yaml

@@ -227,11 +227,3 @@ outputs:
             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. And its state is stored
-              under /var/lib/rsyslog.container.
-          ignore_errors: true

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

@@ -243,14 +243,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/manila-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/manila, 'setype': svirt_sandbox_file_t }
-        - name: manila logs readme
-          copy:
-            dest: /var/log/manila/readme.txt
-            content: |
-              Log files from manila containers can be found under
-              /var/log/containers/manila and /var/log/containers/httpd/manila-api.
-          ignore_errors: true
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1

deployment/manila/manila-scheduler-container-puppet.yaml

@@ -110,14 +110,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/manila, 'setype': svirt_sandbox_file_t }
-        - name: manila logs readme
-          copy:
-            dest: /var/log/manila/readme.txt
-            content: |
-              Log files from manila containers can be found under
-              /var/log/containers/manila and /var/log/containers/httpd/manila-api.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/manila/manila-share-container-puppet.yaml

@@ -166,14 +166,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from manila containers can be found under
-              /var/log/containers/manila and /var/log/containers/httpd/manila-api.
-          ignore_errors: true
         - name: ensure ceph configurations exist
           file:
             path: /etc/ceph

deployment/manila/manila-share-pacemaker-puppet.yaml

@@ -191,14 +191,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from manila containers can be found under
-              /var/log/containers/manila and /var/log/containers/httpd/manila-api.
-          ignore_errors: true
         - name: ensure ceph configurations exist
           file:
             path: /etc/ceph

deployment/memcached/memcached-container-puppet.yaml

@@ -170,20 +170,6 @@ outputs:
                 -
                   - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
             command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; exec /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
-            content: |
-              Memcached container logs to stdout/stderr only.
-          ignore_errors: true
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1

deployment/metrics/collectd-container-puppet.yaml

@@ -644,14 +644,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/collectd, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/collectd, 'setype': svirt_sandbox_file_t }
-        - name: collectd logs readme
-          copy:
-            dest: /var/log/collectd/readme.txt
-            content: |
-              Log files from collectd containers can be found under
-              /var/log/containers/collectd.
-          ignore_errors: true
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/metrics/qdr-container-puppet.yaml

@@ -299,13 +299,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/metrics-qdr, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/lib/metrics-qdr, 'setype': svirt_sandbox_file_t }
-        - name: qrouterd logs readme
-          copy:
-            dest: /var/log/qrouterd/readme-metrics.txt
-            content: |
-              Log files from metrics qrouterd containers can be found under
-              /var/log/containers/metrics-qdr.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -223,14 +223,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
-        - name: mistral logs readme
-          copy:
-            dest: /var/log/mistral/readme.txt
-            content: |
-              Log files from mistral containers can be found under
-              /var/log/containers/mistral.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -139,14 +139,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
-        - name: mistral logs readme
-          copy:
-            dest: /var/log/mistral/readme.txt
-            content: |
-              Log files from mistral containers can be found under
-              /var/log/containers/mistral.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/mistral/mistral-event-engine-container-puppet.yaml

@@ -114,14 +114,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
-        - name: mistral logs readme
-          copy:
-            dest: /var/log/mistral/readme.txt
-            content: |
-              Log files from mistral containers can be found under
-              /var/log/containers/mistral.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -221,7 +221,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/lib/mistral, 'setype': svirt_sandbox_file_t }
-            - { 'path': /var/log/mistral, 'setype': svirt_sandbox_file_t }
         - name: create mistral/.ssh directory
           file:
             path: /var/lib/mistral/.ssh
@@ -241,13 +240,6 @@ outputs:
             mode: 0444
             setype: svirt_sandbox_file_t
             local_follow: true
-        - name: mistral logs readme
-          copy:
-            dest: /var/log/mistral/readme.txt
-            content: |
-              Log files from mistral containers can be found under
-              /var/log/containers/mistral.
-          ignore_errors: true
         - name: create ceph-ansible source directory
           file:
             path: /usr/share/ceph-ansible

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

@@ -223,14 +223,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/nova, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from nova containers can be found under
-              /var/log/containers/nova and /var/log/containers/httpd/nova-*.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/nova/novajoin-container-puppet.yaml

@@ -248,14 +248,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/novajoin, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/novajoin, 'setype': svirt_sandbox_file_t }
-        - name: novajoin logs readme
-          copy:
-            dest: /var/log/novajoin/readme.txt
-            content: |
-              Log files from novajoin containers can be found under
-              /var/log/containers/novajoin
-          ignore_errors: true
         - name: Enroll to FreeIPA
           command: ipa-client-install -U --password={{ ipa_otp }}
           args:

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

@@ -298,14 +298,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/octavia-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
-        - name: octavia logs readme
-          copy:
-            dest: /var/log/octavia/readme.txt
-            content: |
-              Log files from octavia containers can be found under
-              /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
-          ignore_errors: true
       update_tasks:
         - name: Set internal tls variable
           set_fact:

deployment/octavia/octavia-health-manager-container-puppet.yaml

@@ -155,14 +155,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
-        - name: octavia logs readme
-          copy:
-            dest: /var/log/octavia/readme.txt
-            content: |
-              Log files from octavia containers can be found under
-              /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/octavia/octavia-housekeeping-container-puppet.yaml

@@ -154,14 +154,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
-        - name: octavia logs readme
-          copy:
-            dest: /var/log/octavia/readme.txt
-            content: |
-              Log files from octavia containers can be found under
-              /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
-          ignore_errors: true
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1

deployment/octavia/octavia-worker-container-puppet.yaml

@@ -141,14 +141,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/octavia, 'setype': svirt_sandbox_file_t }
-        - name: octavia logs readme
-          copy:
-            dest: /var/log/octavia/readme.txt
-            content: |
-              Log files from octavia containers can be found under
-              /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
-          ignore_errors: true
         - name: Ensure packages required for configuring octavia are present
           package:
             name:

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -274,14 +274,6 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/openvswitch, 'setype': openvswitch_log_t }
-        - name: openvswitch logs readme
-          copy:
-            dest: /var/log/openvswitch/readme.txt
-            content: |
-              Log files from openvswitch containers can be found under
-              /var/log/containers/openvswitch.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

deployment/ovn/ovn-dbs-container-puppet.yaml

@@ -209,14 +209,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': svirt_sandbox_file_t }
-            - { 'path': /var/log/openvswitch, 'setype': openvswitch_log_t }
-        - name: openvswitch logs readme
-          copy:
-            dest: /var/log/openvswitch/readme.txt
-            content: |
-              Log files from openvswitch containers can be found under
-              /var/log/containers/openvswitch.
-          ignore_errors: true
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1

deployment/ovn/ovn-dbs-pacemaker-puppet.yaml

@@ -242,14 +242,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': svirt_sandbox_file_t }
-            - { 'path': /var/log/openvswitch, 'setype': openvswitch_log_t }
-        - name: openvswitch logs readme
-          copy:
-            dest: /var/log/openvswitch/readme.txt
-            content: |
-              Log files from openvswitch containers can be found under
-              /var/log/containers/openvswitch.
-          ignore_errors: true
       deploy_steps_tasks:
         - name: OVN DBS tag container image for pacemaker
           when: step|int == 1

deployment/qdr/qdrouterd-container-puppet.yaml

@@ -141,14 +141,6 @@ outputs:
         with_items:
           - { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
           - { '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
-          content: |
-            Log files from qrouterd containers can be found under
-            /var/log/containers/qrouterd.
-        ignore_errors: true
       metadata_settings: {}
       post_upgrade_tasks:
         - when: step|int == 1

deployment/rabbitmq/rabbitmq-container-puppet.yaml

@@ -350,14 +350,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from rabbitmq containers can be found under
-              /var/log/containers/rabbitmq.
-          ignore_errors: true
       # TODO: Removal of package
       upgrade_tasks: []
       update_tasks:

deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml

@@ -295,14 +295,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from rabbitmq containers can be found under
-              /var/log/containers/rabbitmq.
-          ignore_errors: true
       upgrade_tasks: []
       update_tasks:
         # TODO: Are we sure we want to support this.  Rolling update

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -234,14 +234,6 @@ outputs:
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
-        - name: rabbitmq logs readme
-          copy:
-            dest: /var/log/rabbitmq/readme.txt
-            content: |
-              Log files from rabbitmq containers can be found under
-              /var/log/containers/rabbitmq.
-          ignore_errors: true
         - name: stop the Erlang port mapper on the host and make sure it cannot bind to the port used by container
           shell: |
             echo 'export ERL_EPMD_ADDRESS=127.0.0.1' > /etc/rabbitmq/rabbitmq-env.conf

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -234,14 +234,6 @@ outputs:
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
-        - name: rabbitmq logs readme
-          copy:
-            dest: /var/log/rabbitmq/readme.txt
-            content: |
-              Log files from rabbitmq containers can be found under
-              /var/log/containers/rabbitmq.
-          ignore_errors: true
         - name: stop the Erlang port mapper on the host and make sure it cannot bind to the port used by container
           shell: |
             echo 'export ERL_EPMD_ADDRESS=127.0.0.1' > /etc/rabbitmq/rabbitmq-env.conf

deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

@@ -295,14 +295,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from rabbitmq containers can be found under
-              /var/log/containers/rabbitmq.
-          ignore_errors: true
       upgrade_tasks: []
       update_tasks:
         # TODO: Are we sure we want to support this.  Rolling update

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -242,14 +242,6 @@ outputs:
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/rabbitmq, 'setype': svirt_sandbox_file_t }
-        - name: rabbitmq logs readme
-          copy:
-            dest: /var/log/rabbitmq/readme.txt
-            content: |
-              Log files from rabbitmq containers can be found under
-              /var/log/containers/rabbitmq.
-          ignore_errors: true
         - name: stop the Erlang port mapper on the host and make sure it cannot bind to the port used by container
           shell: |
             echo 'export ERL_EPMD_ADDRESS=127.0.0.1' > /etc/rabbitmq/rabbitmq-env.conf

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

@@ -200,14 +200,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/sahara, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from sahara containers can be found under
-              /var/log/containers/sahara.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -129,14 +129,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/sahara, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { '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
-            content: |
-              Log files from sahara containers can be found under
-              /var/log/containers/sahara.
-          ignore_errors: true
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
             name: virt_sandbox_use_netlink

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

@@ -589,7 +589,6 @@ outputs:
             - { 'path': /srv/node, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/cache/swift, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/log/containers/swift, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/swift, 'setype': var_log_t }
         - name: Set swift_use_local_disks fact
           set_fact:
             swift_use_local_disks: {get_param: SwiftUseLocalDir}
@@ -598,13 +597,6 @@ outputs:
             path: "/srv/node/d1"
             state: directory
           when: swift_use_local_disks
-        - name: swift logs readme
-          copy:
-            dest: /var/log/swift/readme.txt
-            content: |
-              Log files from swift containers can be found under
-              /var/log/containers/swift and /var/log/containers/httpd/swift-*.
-          ignore_errors: true
         - name: Set fact for SwiftRawDisks
           set_fact:
             swift_raw_disks: {get_param: SwiftRawDisks}

deployment/undercloud/tempest-container-puppet.yaml

@@ -60,16 +60,8 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/tempest, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/tempest, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/tempestdata, 'setype': svirt_sandbox_file_t }
             - { 'path': /var/lib/tempest, 'setype': svirt_sandbox_file_t }
-        - name: Tempest logs readme
-          copy:
-            dest: /var/log/tempest/readme.txt
-            content: |
-              Log files from tempest containers can be found under
-              /var/log/containers/tempest.
-          ignore_errors: true
       puppet_config:
         config_volume: ''
         step_config: ''

deployment/zaqar/zaqar-container-puppet.yaml

@@ -372,14 +372,6 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/zaqar, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/zaqar, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-            - { 'path': /var/log/zaqar, 'setype': svirt_sandbox_file_t }
-        - name: zaqar logs readme
-          copy:
-            dest: /var/log/zaqar/readme.txt
-            content: |
-              Log files from zaqar containers can be found under
-              /var/log/containers/zaqar and /var/log/containers/httpd/zaqar.
-          ignore_errors: true
       post_upgrade_tasks:
         - when: step|int == 1
           import_role: