openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Fix ceilometer logic in cinder.conf 

This logic was fixed in the Newton time frame as part of
Ia2f906af5d98c98ffcdbc07ab88ee7b0993eeb8c
The fix to the ceilometer was not backported, this patch simply fixes
the logic failing for the Ceilometer configuration inside cinder.conf,
and ensures that the Ceilometer configuration is setup regardless of
whether the host is a storage or api cinder host.

Change-Id: I76797470065272ba72d10bfddebb327ad02b5dcd
Closes-Bug: #1654038
This commit is contained in:
Andy McCrae 2017-01-10 16:22:57 +00:00
parent b41c5886ec
commit cb20d214df
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/cinder.conf.j2
View File

@ -97,11 +97,6 @@ default_volume_type = {{ cinder_default_volume_type }}
{% if cinder_backends is defined %}
enabled_backends={% for backend in cinder_backends|dictsort %}{{ backend.0 }}{% if not loop.last %},{% endif %}{% endfor %}
{% if cinder_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
{% endif %}
# All given backend(s)
{% for backend_section in cinder_backends|dictsort %}
[{{ backend_section.0 }}]
@ -115,6 +110,11 @@ nfs_shares_config={{ cinder_nfs_client.nfs_shares_config }}
{% endfor %}
{% endif %}
{% if cinder_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
{% endif %}
[database]
connection = mysql+pymysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password }}@{{ cinder_galera_address }}/{{ cinder_galera_database }}?charset=utf8