openstack
/
tripleo-image-elements
Code Issues Proposed changes

Ceilometer API fails: bad rabbit_use_ssl setting 

This patch updates the ceilometer.conf file to avoid an issue
where rabbit_use_ssl got set to <blank> if no Heat metadata
for this setting is provided. Some of our heat templates
(the undercloud for example) do not currently provide this
information and as such Ceilometer API fails to startup
correctly in those deployments.

Change-Id: I0a7dcfb54a0f113e0a3e59e3ccedfe0f485bf12d
Closes-bug: #1416499
This commit is contained in:
Dan Prince 2015-01-30 13:14:55 -05:00
parent e9baa4dae7
commit 3028170be1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf
View File

@ -12,7 +12,9 @@ rabbit_port={{.}}
{{^rabbit_port}}
rabbit_port=5672
{{/rabbit_port}}
rabbit_use_ssl={{rabbit.rabbit_client_use_ssl}}
{{#rabbit.rabbit_client_use_ssl}}
rabbit_use_ssl={{.}}
{{/rabbit.rabbit_client_use_ssl}}
{{#rabbit.host}}
rabbit_host={{.}}
{{/rabbit.host}}