Merge "Fix Logstash 2.4 log rotation" into stable/stein

ansible/roles/common/tasks/config.yml

@@ -291,6 +291,7 @@
     - { name: "keystone", enabled: "{{ enable_keystone }}" }
     - { name: "kibana", enabled: "{{ enable_kibana }}" }
     - { name: "kuryr", enabled: "{{ enable_kuryr }}" }
+    - { name: "logstash", enabled: "{{ enable_monasca }}" }
     - { name: "magnum", enabled: "{{ enable_magnum }}" }
     - { name: "manila", enabled: "{{ enable_manila }}" }
     - { name: "mariadb", enabled: "{{ enable_mariadb }}" }

ansible/roles/common/templates/cron-logrotate-logstash.conf.j2

@@ -0,0 +1,3 @@
+"/var/log/kolla/logstash/*.log"
+{
+}

ansible/roles/common/templates/cron.json.j2

@@ -31,6 +31,7 @@
     ( 'keystone', enable_keystone ),
     ( 'kibana', enable_kibana ),
     ( 'kuryr', enable_kuryr ),
+    ( 'logstash', enable_monasca ),
     ( 'magnum', enable_magnum ),
     ( 'manila', enable_manila ),
     ( 'mariadb', enable_mariadb ),

releasenotes/notes/bug-1886787-013164ffc2f67264.yaml

@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    This patch adds ``kolla-ansible`` internal logrotate config for
+    Logstash. Logstash 2.4 uses integrated in container logrotate
+    configuration which tries to rotate logs in /var/log/logstash
+    while ``kolla-ansible`` deployed Logstash logs are in
+    /var/log/kolla/logstash.
+    `LP#1886787 <https://launchpad.net/bugs/1886787>`__