openstack
/
openstack-ansible-os_ceilometer
Code Issues Proposed changes

Check for AODH host before adding alarm_connection 

Currently the os_ceilometer role will configure ceilometer.conf to
include a line in the [databases] section for alarm_connection no matter
what, and it will default to looking for the aodh user in mongodb
serving at localhost. If the user installs ceilometer but not aodh, this
will break the ceilometer service as the API will not start up while it
times out looking for the unconfigured database. This patch ensures that
there are hosts configured for AODH before adding that line to the conf
file.

Change-Id: If27e19e7c6bb2d20e7b0093a8d4e29c30952fb14
Closes-bug: #1549426
This commit is contained in:
Nate Potter 2016-03-03 16:22:55 +00:00
parent e090a5523e
commit d9dfc53a4a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/ceilometer.conf.j2
View File

@ -77,7 +77,9 @@ messaging_urls = rabbit://{{ keystone_rabbitmq_userid }}:{{ keystone_rabbitmq_pa
[database]
metering_connection = {{ ceilometer_connection_string }}
event_connection = {{ ceilometer_connection_string }}
{% if groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 %}
alarm_connection = {{ aodh_connection_string }}
{% endif %}
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}