From 2346e5ced407e579fdfe4207500cffe4a69504e3 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 25 Sep 2015 11:56:32 -0500 Subject: [PATCH] Fixes log rotate issue This change implements a change in the file name for each service so that the log rotate files don't collide when running on a shared host. Change-Id: Ia42656e4568c43667d610aa8421d2fa25437e2aa Closes-Bug: 1499799 --- playbooks/galera-install.yml | 1 + playbooks/lxc-hosts-setup.yml | 1 + playbooks/os-ceilometer-install.yml | 1 + playbooks/os-cinder-install.yml | 1 + playbooks/os-glance-install.yml | 1 + playbooks/os-heat-install.yml | 1 + playbooks/os-horizon-install.yml | 1 + playbooks/os-keystone-install.yml | 1 + playbooks/os-neutron-install.yml | 1 + playbooks/os-nova-install.yml | 1 + playbooks/os-swift-setup.yml | 1 + playbooks/os-tempest-install.yml | 1 + playbooks/rabbitmq-install.yml | 1 + playbooks/repo-server.yml | 1 + playbooks/roles/rsyslog_client/defaults/main.yml | 2 ++ .../roles/rsyslog_client/tasks/rsyslog_client_post_install.yml | 2 +- 16 files changed, 17 insertions(+), 1 deletion(-) diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index 9ef6872c16..a9b0768692 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -59,6 +59,7 @@ roles: - { role: "galera_server", tags: [ "galera-server" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: galera_log_rotate rsyslog_client_log_dir: "/var/log/mysql_logs" rsyslog_client_log_files: - /var/log/mysql.log diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml index 3fc1154429..f0ce0a7d55 100644 --- a/playbooks/lxc-hosts-setup.yml +++ b/playbooks/lxc-hosts-setup.yml @@ -21,6 +21,7 @@ - { role: "lxc_hosts", tags: [ "lxc-host", "host-setup" ] } - { role: "py_from_git", tags: [ "lxc-libs" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: lxc_log_rotate rsyslog_client_log_dir: "/var/log/lxc" rsyslog_client_config_name: "99-lxc-rsyslog-client.conf" tags: diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 091e464306..ae213920c0 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -73,6 +73,7 @@ - { role: "os_ceilometer", tags: [ "os-ceilometer" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: ceilometer_log_rotate rsyslog_client_log_dir: "/var/log/ceilometer" rsyslog_client_config_name: "99-ceilometer-rsyslog-client.conf" tags: diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 9fcfa16e7b..6d2be3c6fb 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -118,6 +118,7 @@ - "cinder-ceph-client" - "ceph-client" - role: "rsyslog_client" + rsyslog_client_log_rotate_file: cinder_log_rotate rsyslog_client_log_dir: "/var/log/cinder" rsyslog_client_config_name: "99-cinder-rsyslog-client.conf" tags: diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 803cf29708..b6f5aa5701 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -89,6 +89,7 @@ - "glance-ceph-client" - "ceph-client" - role: "rsyslog_client" + rsyslog_client_log_rotate_file: glance_log_rotate rsyslog_client_log_dir: "/var/log/glance" rsyslog_client_config_name: "99-glance-rsyslog-client.conf" tags: diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index dbbf5e5e8d..8952bcfc85 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -72,6 +72,7 @@ roles: - { role: "os_heat", tags: [ "os-heat" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: heat_log_rotate rsyslog_client_log_dir: "/var/log/heat" rsyslog_client_config_name: "99-heat-rsyslog-client.conf" tags: diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 6dd1a89820..07e25292ec 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -72,6 +72,7 @@ roles: - { role: "os_horizon", tags: [ "os-horizon" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: horizon_log_rotate rsyslog_client_log_dir: "/var/log/apache2" rsyslog_client_config_name: "99-horizon-rsyslog-client.conf" tags: diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 55ef5b2686..cab9327201 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -73,6 +73,7 @@ - { role: "os_keystone", tags: [ "os-keystone" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: keystone_log_rotate rsyslog_client_log_dir: "/var/log/apache2" rsyslog_client_config_name: "99-keystone-rsyslog-client.conf" tags: diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 8a8c079b84..428110bae8 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -105,6 +105,7 @@ - { role: "os_neutron", tags: [ "os-neutron" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: neutron_log_rotate rsyslog_client_log_dir: "/var/log/neutron" rsyslog_client_config_name: "99-neutron-rsyslog-client.conf" rsyslog_client_log_files: diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 69defebb7d..572599fb0b 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -119,6 +119,7 @@ - "ceph-client" - { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: nova_log_rotate rsyslog_client_log_dir: "/var/log/nova" rsyslog_client_config_name: "99-nova-rsyslog-client.conf" tags: diff --git a/playbooks/os-swift-setup.yml b/playbooks/os-swift-setup.yml index d14a202442..f4bd554a1e 100644 --- a/playbooks/os-swift-setup.yml +++ b/playbooks/os-swift-setup.yml @@ -71,6 +71,7 @@ roles: - { role: "os_swift", tags: [ "os-swift" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: swift_log_rotate rsyslog_client_log_dir: "/var/log/swift" rsyslog_client_config_name: "99-swift-rsyslog-client.conf" tags: diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 69720689f5..01663cfb9c 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -20,6 +20,7 @@ roles: - { role: "os_tempest", tags: [ "os-tempest" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: utility_log_rotate rsyslog_client_log_dir: "/var/log/utility" rsyslog_client_config_name: "99-tempest-rsyslog-client.conf" tags: diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 9de723cbf0..12a4d72ed2 100644 --- a/playbooks/rabbitmq-install.yml +++ b/playbooks/rabbitmq-install.yml @@ -45,6 +45,7 @@ - "rabbitmq-server" - "upgrade-rabbitmq-server" - role: "rsyslog_client" + rsyslog_client_log_rotate_file: rabbitmq_log_rotate rsyslog_client_log_dir: "/var/log/rabbitmq" rsyslog_client_config_name: "99-rabbitmq-rsyslog-client.conf" tags: diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index ae0286aafa..05016d226c 100644 --- a/playbooks/repo-server.yml +++ b/playbooks/repo-server.yml @@ -53,6 +53,7 @@ roles: - { role: "repo_server", tags: [ "repo-server" ] } - role: "rsyslog_client" + rsyslog_client_log_rotate_file: repo_log_rotate rsyslog_client_log_dir: "/var/log/nginx" rsyslog_client_log_files: - /var/www/repo_builder.log diff --git a/playbooks/roles/rsyslog_client/defaults/main.yml b/playbooks/roles/rsyslog_client/defaults/main.yml index ef706cb53c..a1e0604a76 100644 --- a/playbooks/roles/rsyslog_client/defaults/main.yml +++ b/playbooks/roles/rsyslog_client/defaults/main.yml @@ -48,6 +48,8 @@ rsyslog_client_tcp_port: 514 # Define the log files list as empty rsyslog_client_log_files: [] +rsyslog_client_log_rotate_file: os_aggregate_storage + # Set the `rsyslog_client_user_defined_targets` to define specific log targets. # This option will allow you to define multiple log targets with different templates # and options. The value of this variable is a list of hashes with the following diff --git a/playbooks/roles/rsyslog_client/tasks/rsyslog_client_post_install.yml b/playbooks/roles/rsyslog_client/tasks/rsyslog_client_post_install.yml index 722861d7aa..38249c8d61 100644 --- a/playbooks/roles/rsyslog_client/tasks/rsyslog_client_post_install.yml +++ b/playbooks/roles/rsyslog_client/tasks/rsyslog_client_post_install.yml @@ -49,7 +49,7 @@ group: "root" with_items: - { src: "99-rsyslog.conf.j2", dest: "/etc/rsyslog.d/{{ rsyslog_client_config_name }}" } - - { src: "os_aggregate_storage.j2", dest: "/etc/logrotate.d/os_aggregate_storage" } + - { src: "os_aggregate_storage.j2", dest: "/etc/logrotate.d/{{ rsyslog_client_log_rotate_file }}" } - { src: "rsyslog.conf.j2", dest: "/etc/rsyslog.conf" } tags: - rsyslog-client-config