diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-21 11:08:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-21 11:08:31 +0000 |
| commit | 807eab2b36a774712434eda08b74229a8b7a68aa (patch) | |
| tree | d8aeefb99da7857262f185c86fca7b418f4ce869 | |
| parent | 89b812971dd0c0f36bbd8be7796c162112272162 (diff) | |
| parent | 8775123b2371c84030320f12779d1c8e5f049584 (diff) | |
| download | kolla-807eab2b36a774712434eda08b74229a8b7a68aa.tar.gz kolla-807eab2b36a774712434eda08b74229a8b7a68aa.zip | |
Merge "Add logrotate configuration for elasticsearch"
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron.json.j2 | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index bc13f2841..f6f1ac4a0 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -27,7 +27,7 @@ with_items: - { name: "aodh", enabled: "{{ enable_aodh }}" } - { name: "barbican", enabled: "{{ enable_barbican }}"} - - { name: "elasticsearch", enabled: "{{ enable_central_logging }}" } + - { name: "elasticsearch", enabled: "{{ enable_elasticsearch }}" } - { name: "global", enabled: "yes" } - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" } - { name: "haproxy", enabled: "{{ enable_haproxy }}" } @@ -74,6 +74,7 @@ - { name: "barbican", enabled: "{{ enable_barbican }}" } - { name: "cinder", enabled: "{{ enable_cinder }}" } - { name: "cloudkitty", enabled: "{{ enable_cloudkitty }}" } + - { name: "elasticsearch", enabled: "{{ enable_elasticsearch }}" } - { name: "glance", enabled: "{{ enable_glance }}" } - { name: "global", enabled: "yes" } - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" } diff --git a/ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 b/ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 new file mode 100644 index 000000000..cbdd2c780 --- /dev/null +++ b/ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j2 @@ -0,0 +1,3 @@ +"/var/log/kolla/elasticsearch/*.log" +{ +} diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2 index 4d25f11d4..295ca660b 100644 --- a/ansible/roles/common/templates/cron.json.j2 +++ b/ansible/roles/common/templates/cron.json.j2 @@ -5,6 +5,7 @@ ( 'barbican', enable_barbican ), ( 'cinder', enable_cinder ), ( 'cloudkitty', enable_cloudkitty ), + ( 'elasticsearch', enable_elasticsearch ), ( 'glance', enable_glance ), ( 'gnocchi', enable_gnocchi ), ( 'haproxy', enable_haproxy ), |