From 224125bf5e9eb4ad9fe4a35b37bba36b4ae822fe Mon Sep 17 00:00:00 2001
From: Kien Nguyen <kiennt65@viettel.com.vn>
Date: Thu, 11 Oct 2018 16:45:51 +0700
Subject: [PATCH] Add Aodh evaluation_interval

Alarm service has been moved to Aodh for a long time [1].
Therefore, we should define evaluation_interval in
aodh.conf rather than ceilometer.conf. The interval value
should be configurable as well because we can use a
custom polling config now [2]

[1] https://review.openstack.org/#/c/200593/
[2] https://review.openstack.org/#/c/572013/

Change-Id: I7adeff2dff5d6d6ae4c621e84857347995e9203a
---
 ansible/roles/aodh/defaults/main.yml                  | 8 ++++++++
 ansible/roles/aodh/templates/aodh.conf.j2             | 1 +
 ansible/roles/ceilometer/templates/ceilometer.conf.j2 | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/aodh/defaults/main.yml b/ansible/roles/aodh/defaults/main.yml
index 4fc1993f77..20b91959d1 100644
--- a/ansible/roles/aodh/defaults/main.yml
+++ b/ansible/roles/aodh/defaults/main.yml
@@ -59,6 +59,14 @@ aodh_services:
       - "{{ kolla_dev_repos_directory ~ '/aodh/aodh:/var/lib/kolla/venv/lib/python2.7/site-packages/aodh' if aodh_dev_mode | bool else '' }}"
     dimensions: "{{ aodh_notifier_dimensions }}"
 
+# Aodh Evaluation interval - Period of evaluation cycle, should
+# be >= than configured polling interval for collection of
+# underlying meters which by default be defined in
+# /etc/ceilometer/polling.yaml (300).
+# If you uses a custom polling.yaml which has a different interval,
+# change this option.
+aodh_evaluation_interval: 300
+
 
 ####################
 # Database
diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2
index 3e2a2ea57b..42bcf74b2f 100644
--- a/ansible/roles/aodh/templates/aodh.conf.j2
+++ b/ansible/roles/aodh/templates/aodh.conf.j2
@@ -3,6 +3,7 @@
 auth_strategy = keystone
 log_dir = /var/log/kolla/aodh
 debug = {{ aodh_logging_debug }}
+evaluation_interval = {{ aodh_evaluation_interval }}
 transport_url = {{ rpc_transport_url }}
 
 [api]
diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
index b70054f576..a57f874883 100644
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@@ -5,10 +5,6 @@ log_dir = /var/log/kolla/ceilometer
 
 transport_url = {{ rpc_transport_url }}
 
-{% if enable_aodh | bool %}
-evaluation_interval = 300
-{% endif %}
-
 {% if nova_compute_virt_type == 'vmware' %}
 hypervisor_inspector = vsphere
 {% elif nova_compute_virt_type == 'xenapi' %}