openstack/openstack-ansible
Code Issues Proposed changes

Fixes log rotate issue

Browse Source 
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
This commit is contained in:
Kevin Carter 2015-09-25 11:56:32 -05:00 committed by Jesse Pretorius
parent 6ff056a9eb
commit 2346e5ced4
16 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/galera-install.yml
View File

@ -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

1
playbooks/lxc-hosts-setup.yml
View File

@ -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:

1
playbooks/os-ceilometer-install.yml
View File

@ -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:

1
playbooks/os-cinder-install.yml
View File

@ -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:

1
playbooks/os-glance-install.yml
View File

@ -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:

1
playbooks/os-heat-install.yml
View File

@ -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:

1
playbooks/os-horizon-install.yml
View File

@ -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:

1
playbooks/os-keystone-install.yml
View File

@ -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:

1
playbooks/os-neutron-install.yml
View File

@ -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:

1
playbooks/os-nova-install.yml
View File

@ -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:

1
playbooks/os-swift-setup.yml
View File

@ -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:

1
playbooks/os-tempest-install.yml
View File

@ -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:

1
playbooks/rabbitmq-install.yml
View File

@ -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:

1
playbooks/repo-server.yml
View File

@ -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

2
playbooks/roles/rsyslog_client/defaults/main.yml
View File

@ -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

2
playbooks/roles/rsyslog_client/tasks/rsyslog_client_post_install.yml
View File

@ -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