From 7906fb43be72a150b5d10e0e18b21b568895b6e0 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 4 Nov 2019 09:19:07 -0700 Subject: [PATCH] Drop legacy log folder and readme We switched to containers a long time ago. This patch drops the management of a /var/log/ directory and the creation of a readme indicating that we've moved to containers which makes the logging available under /var/log/containers/ Change-Id: Ia4e991d5d937031ac3312f639b726a944743dd1e --- deployment/aodh/aodh-api-container-puppet.yaml | 8 -------- .../aodh/aodh-evaluator-container-puppet.yaml | 8 -------- .../aodh/aodh-listener-container-puppet.yaml | 8 -------- .../aodh/aodh-notifier-container-puppet.yaml | 7 ------- .../ceilometer-agent-central-container-puppet.yaml | 8 -------- .../ceilometer-agent-compute-container-puppet.yaml | 8 -------- .../ceilometer-agent-ipmi-container-puppet.yaml | 8 -------- ...ometer-agent-notification-container-puppet.yaml | 8 -------- deployment/cinder/cinder-api-container-puppet.yaml | 8 -------- .../cinder/cinder-common-container-puppet.yaml | 8 -------- .../cinder/cinder-scheduler-container-puppet.yaml | 8 -------- deployment/database/mysql-container-puppet.yaml | 8 -------- deployment/database/mysql-pacemaker-puppet.yaml | 8 -------- deployment/database/redis-container-puppet.yaml | 8 -------- deployment/database/redis-pacemaker-puppet.yaml | 8 -------- .../designate/designate-api-container-puppet.yaml | 8 -------- .../designate-central-container-puppet.yaml | 8 -------- .../designate/designate-mdns-container-puppet.yaml | 7 ------- .../designate-producer-container-puppet.yaml | 8 -------- .../designate/designate-sink-container-puppet.yaml | 8 -------- .../designate-worker-container-puppet.yaml | 8 -------- .../glance/glance-api-logging-file-container.yaml | 8 -------- .../gnocchi/gnocchi-api-container-puppet.yaml | 8 -------- .../gnocchi/gnocchi-metricd-container-puppet.yaml | 8 -------- .../gnocchi/gnocchi-statsd-container-puppet.yaml | 8 -------- deployment/haproxy/haproxy-container-puppet.yaml | 8 -------- deployment/haproxy/haproxy-pacemaker-puppet.yaml | 7 ------- deployment/horizon/horizon-container-puppet.yaml | 8 -------- deployment/ironic/ironic-api-container-puppet.yaml | 8 -------- .../ironic/ironic-conductor-container-puppet.yaml | 8 -------- .../ironic/ironic-inspector-container-puppet.yaml | 8 -------- deployment/ironic/ironic-pxe-container-puppet.yaml | 8 -------- .../keepalived/keepalived-container-puppet.yaml | 8 -------- deployment/logging/files/barbican-api.yaml | 8 -------- deployment/logging/files/heat-api-cfn.yaml | 8 -------- deployment/logging/files/heat-api.yaml | 8 -------- deployment/logging/files/heat-engine.yaml | 8 -------- deployment/logging/files/keystone.yaml | 8 -------- deployment/logging/files/neutron-api.yaml | 8 -------- deployment/logging/files/neutron-common.yaml | 8 -------- deployment/logging/files/nova-api.yaml | 8 -------- deployment/logging/files/nova-common.yaml | 8 -------- deployment/logging/files/nova-libvirt.yaml | 7 ------- deployment/logging/files/nova-metadata.yaml | 8 -------- deployment/logging/files/placement-api.yaml | 8 -------- deployment/logging/rsyslog-container-puppet.yaml | 8 -------- deployment/manila/manila-api-container-puppet.yaml | 8 -------- .../manila/manila-scheduler-container-puppet.yaml | 8 -------- .../manila/manila-share-container-puppet.yaml | 8 -------- .../manila/manila-share-pacemaker-puppet.yaml | 8 -------- .../memcached/memcached-container-puppet.yaml | 14 -------------- deployment/metrics/collectd-container-puppet.yaml | 8 -------- deployment/metrics/qdr-container-puppet.yaml | 7 ------- .../mistral/mistral-api-container-puppet.yaml | 8 -------- .../mistral/mistral-engine-container-puppet.yaml | 8 -------- .../mistral-event-engine-container-puppet.yaml | 8 -------- .../mistral/mistral-executor-container-puppet.yaml | 8 -------- deployment/nova/nova-ironic-container-puppet.yaml | 8 -------- deployment/nova/novajoin-container-puppet.yaml | 8 -------- .../octavia/octavia-api-container-puppet.yaml | 8 -------- .../octavia-health-manager-container-puppet.yaml | 8 -------- .../octavia-housekeeping-container-puppet.yaml | 8 -------- .../octavia/octavia-worker-container-puppet.yaml | 8 -------- .../ovn/ovn-controller-container-puppet.yaml | 8 -------- deployment/ovn/ovn-dbs-container-puppet.yaml | 8 -------- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 8 -------- deployment/qdr/qdrouterd-container-puppet.yaml | 8 -------- deployment/rabbitmq/rabbitmq-container-puppet.yaml | 8 -------- ...rabbitmq-messaging-notify-container-puppet.yaml | 8 -------- ...rabbitmq-messaging-notify-pacemaker-puppet.yaml | 8 -------- .../rabbitmq-messaging-pacemaker-puppet.yaml | 8 -------- .../rabbitmq-messaging-rpc-container-puppet.yaml | 8 -------- .../rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 8 -------- deployment/sahara/sahara-api-container-puppet.yaml | 8 -------- .../sahara/sahara-engine-container-puppet.yaml | 8 -------- .../swift/swift-storage-container-puppet.yaml | 8 -------- .../undercloud/tempest-container-puppet.yaml | 8 -------- deployment/zaqar/zaqar-container-puppet.yaml | 8 -------- 78 files changed, 625 deletions(-) diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index aadab529bb..24a80c5d6a 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/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: diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index 87e16d2a3e..f79431c496 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/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: diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 35ef262d64..1f17926c16 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/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: diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index 11ce25ab9a..cfe0112e53 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/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: diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index cb24299f4c..52aa9111c0 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/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: diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index bcbdf38685..b2b1e6d5e4 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/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 diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 6134328bf3..e3d28090ad 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/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: diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 2d7be0767d..aaf35a6816 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 90b15b0459..2bb00cf371 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/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: diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index 2a269a0085..b674538813 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 5a0e311fcf..343fada503 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/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 diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index f060639b7a..61dfa79b96 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/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 diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index f97eba5751..4f737e0740 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index d286d0c428..c9a0fb24fb 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/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 diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 4d44d750e9..3f730d7d89 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 9523fa3eb1..1d357cae94 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index bbce0590de..54af2ce748 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index fcb8f95bb5..0fde9197df 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index 52de2c51e0..88eac4ca5e 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index 66bc08986c..0a79880e80 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index 56dba945c9..909fc63c73 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/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 diff --git a/deployment/glance/glance-api-logging-file-container.yaml b/deployment/glance/glance-api-logging-file-container.yaml index 02c92071f4..fea4ece49e 100644 --- a/deployment/glance/glance-api-logging-file-container.yaml +++ b/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 diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 46e80a0336..9ac7074ca4 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/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 diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index 0ea9e1906d..15f3e6d2fd 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/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} diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 16642257a6..62cf69114f 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/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} diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index a623b32eab..7efcf75329 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/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]} diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index db833c4699..7a13e515de 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/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 }}" diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index c64dfdb339..c4f239c223 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/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 diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 904a00c7e1..4608e2d11a 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/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: diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index bd24962b77..fb23d3aa8f 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/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 diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 263f1615f3..6a01408bac 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/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 diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 5b9f88d82c..b531487d7f 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/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: diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 8477bda53b..4cbda3ceb1 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/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: diff --git a/deployment/logging/files/barbican-api.yaml b/deployment/logging/files/barbican-api.yaml index 581173a1a0..4d49694cd4 100644 --- a/deployment/logging/files/barbican-api.yaml +++ b/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 diff --git a/deployment/logging/files/heat-api-cfn.yaml b/deployment/logging/files/heat-api-cfn.yaml index 55cbd83f90..cbd36c8183 100644 --- a/deployment/logging/files/heat-api-cfn.yaml +++ b/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 diff --git a/deployment/logging/files/heat-api.yaml b/deployment/logging/files/heat-api.yaml index eb8743de90..82258212c4 100644 --- a/deployment/logging/files/heat-api.yaml +++ b/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 diff --git a/deployment/logging/files/heat-engine.yaml b/deployment/logging/files/heat-engine.yaml index 341730c56f..93b3704083 100644 --- a/deployment/logging/files/heat-engine.yaml +++ b/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 diff --git a/deployment/logging/files/keystone.yaml b/deployment/logging/files/keystone.yaml index 576ab36453..952c40af76 100644 --- a/deployment/logging/files/keystone.yaml +++ b/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 diff --git a/deployment/logging/files/neutron-api.yaml b/deployment/logging/files/neutron-api.yaml index 598677f219..424513bb6c 100644 --- a/deployment/logging/files/neutron-api.yaml +++ b/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 diff --git a/deployment/logging/files/neutron-common.yaml b/deployment/logging/files/neutron-common.yaml index ac23705684..3f2989c1bb 100644 --- a/deployment/logging/files/neutron-common.yaml +++ b/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 diff --git a/deployment/logging/files/nova-api.yaml b/deployment/logging/files/nova-api.yaml index 895f30ec94..dddd391e44 100644 --- a/deployment/logging/files/nova-api.yaml +++ b/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 diff --git a/deployment/logging/files/nova-common.yaml b/deployment/logging/files/nova-common.yaml index 76eebca34d..43d3c5435e 100644 --- a/deployment/logging/files/nova-common.yaml +++ b/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 diff --git a/deployment/logging/files/nova-libvirt.yaml b/deployment/logging/files/nova-libvirt.yaml index 0922fc01d9..dc9cff9216 100644 --- a/deployment/logging/files/nova-libvirt.yaml +++ b/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 diff --git a/deployment/logging/files/nova-metadata.yaml b/deployment/logging/files/nova-metadata.yaml index 0b06934072..1df5e8e578 100644 --- a/deployment/logging/files/nova-metadata.yaml +++ b/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 diff --git a/deployment/logging/files/placement-api.yaml b/deployment/logging/files/placement-api.yaml index 8a49d4f247..a730640775 100644 --- a/deployment/logging/files/placement-api.yaml +++ b/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 diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index 30bcda4d5c..9fd546a2f0 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/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 diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 5fe10a82f6..f3f9766eb6 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/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 diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index c220c94b95..629c15a300 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/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 diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 58155e4bd3..0916b69427 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/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 diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index b4778e9c7c..e93db13971 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index acaf5501ab..0dc0955c98 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/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 diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 4325d1f42f..4019310140 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/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 diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index 450f99b4ec..a56dc81487 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/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: diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index 17343257c5..5eeba6115d 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/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: diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index 18822768fe..f119d6f23a 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index fb71314f4e..3e9ab7522d 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index b286c5ce47..d73a31da75 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 62592388ee..549186bf44 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml index 78b44458f5..ebe15c5518 100644 --- a/deployment/nova/novajoin-container-puppet.yaml +++ b/deployment/nova/novajoin-container-puppet.yaml @@ -242,14 +242,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: diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index c917c12d0a..107f4b6b14 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/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: diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 7ae35fb37f..3045441e89 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/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: diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index f14771af87..982a11d169 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/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 diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 52cefbf8e5..27a9a5628d 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/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: diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index cb8767fa22..2f87d8b219 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/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 diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index ed3fe2c1d0..95fbc25c88 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/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 diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 1b0c7f316c..fbcb1f51ed 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index 25b572acce..c5231c8e91 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/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 diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index 630a5c8281..fe940c0c51 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index afa8e49b15..0b713fcc26 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 7528ddb6be..4e77800b37 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 6d8765a975..aa4e5d045d 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 3d996f3be9..15de0952c8 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 84122785d5..2b5ba1d60f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index 5fb35df142..6cd86cef0f 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/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: diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index 7defddf414..42e1dca87c 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index f856e7584b..f1ccae3ddb 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/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} diff --git a/deployment/undercloud/tempest-container-puppet.yaml b/deployment/undercloud/tempest-container-puppet.yaml index 64c9f22c5f..f285ec896e 100644 --- a/deployment/undercloud/tempest-container-puppet.yaml +++ b/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: '' diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 8afee593e9..deec3c623c 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/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: