Merge "Add Aodh evaluation_interval"

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

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]

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' %}