Merge "Add openvswitch and prometheus to logrotate"

ansible/roles/common/tasks/config.yml

@@ -184,13 +184,14 @@
       - { name: "monasca", enabled: "{{ enable_monasca | bool }}" }
       - { name: "murano", enabled: "{{ enable_murano | bool }}" }
       - { name: "neutron", enabled: "{{ enable_neutron | bool }}" }
-      - { name: "neutron-tls-proxy", enabled: "{{ neutron_enable_tls_backend |
-      bool }}" }
+      - { name: "neutron-tls-proxy", enabled: "{{ neutron_enable_tls_backend | bool }}" }
       - { name: "nova", enabled: "{{ enable_nova | bool }}" }
       - { name: "nova-libvirt", enabled: "{{ enable_nova | bool and nova_compute_virt_type in ['kvm', 'qemu'] }}" }
       - { name: "octavia", enabled: "{{ enable_octavia | bool }}" }
+      - { name: "openvswitch", enabled: "{{ enable_openvswitch | bool }}" }
       - { name: "outward-rabbitmq", enabled: "{{ enable_outward_rabbitmq | bool }}" }
       - { name: "placement", enabled: "{{ enable_placement | bool }}" }
+      - { name: "prometheus", enabled: "{{ enable_prometheus | bool }}" }
       - { name: "rabbitmq", enabled: "{{ enable_rabbitmq | bool }}" }
       - { name: "sahara", enabled: "{{ enable_sahara | bool }}" }
       - { name: "senlin", enabled: "{{ enable_senlin | bool }}" }

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

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

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

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

releasenotes/notes/bug-1961795-16fb2ac27152fc03.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes logrotate config missing for openvswitch and
+    prometheus services.
+    `LP#1961795 <https://launchpad.net/bugs/1961795>`__