aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2016-10-17 20:50:58 +0200
committerChristian Berendt <berendt@betacloud-solutions.de>2016-10-19 22:23:10 +0200
commit8775123b2371c84030320f12779d1c8e5f049584 (patch)
tree7b29801dbfed861e1bf4bdb7426cc7f3ea296aa6
parent982f6ff4427ee73bfc0604c754afb8860df93321 (diff)
downloadkolla-8775123b2371c84030320f12779d1c8e5f049584.tar.gz
kolla-8775123b2371c84030320f12779d1c8e5f049584.zip
Add logrotate configuration for elasticsearch
Change-Id: I6af9935e46dcd3c2f9ea18545e059e055b840d90 Closes-bug: #1634223
-rw-r--r--ansible/roles/common/tasks/config.yml3
-rw-r--r--ansible/roles/common/templates/cron-logrotate-elasticsearch.conf.j23
-rw-r--r--ansible/roles/common/templates/cron.json.j21
3 files changed, 6 insertions, 1 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index a13fa96d2..ee2b3d77b 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 e90ab4f9c..8dae117a4 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 ),