diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-13 14:58:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-13 14:58:51 +0000 |
| commit | 20aa74bb7a17a834d46a0635688748f005ead96e (patch) | |
| tree | b7c811e70b3f82c8e27ecb369a303f955c4c0240 | |
| parent | 27f1cad74f84e4ac32267328b7bd3d5edb6bc6f5 (diff) | |
| parent | b34ede31d4830ddb12acfc064abee8b4e0b4686a (diff) | |
| download | kolla-20aa74bb7a17a834d46a0635688748f005ead96e.tar.gz kolla-20aa74bb7a17a834d46a0635688748f005ead96e.zip | |
Merge "Enable Block Storage meters"
| -rw-r--r-- | ansible/roles/cinder/templates/cinder.conf.j2 | 5 | ||||
| -rw-r--r-- | releasenotes/notes/support-ceilometer-in-cinder-4386a3e5d134d84f.yaml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 77449814c..a20182497 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -42,6 +42,11 @@ nova_catalog_info = compute:nova:internalURL auth_strategy = keystone +[oslo_messaging_notifications] +{% if enable_ceilometer | bool %} +driver = messagingv2 +{% endif %} + [database] connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{{ cinder_database_address }}/{{ cinder_database_name }} max_retries = -1 diff --git a/releasenotes/notes/support-ceilometer-in-cinder-4386a3e5d134d84f.yaml b/releasenotes/notes/support-ceilometer-in-cinder-4386a3e5d134d84f.yaml new file mode 100644 index 000000000..ef64e092b --- /dev/null +++ b/releasenotes/notes/support-ceilometer-in-cinder-4386a3e5d134d84f.yaml @@ -0,0 +1,4 @@ +--- +features: + - Use [oslo_messaging_notifications]/driver option in cinder.conf + to enable block storage meters. |