Merge "Configure Ceilometer middleware for Gnocchi-Swift"

This commit is contained in:
Jenkins 2016-09-14 18:49:19 +00:00 committed by Gerrit Code Review
commit 60d23ba7bf
2 changed files with 7 additions and 0 deletions

View File

@ -189,6 +189,10 @@ glance_service_user_name: glance
# These are here rather than in glance_all because
# both the os_ceilometer and os_glance roles require them
## Gnocchi
# Used in both Gnocchi and Swift roles.
gnocchi_service_project_name: "{{ (gnocchi_storage_driver is defined and gnocchi_storage_driver == 'swift') | ternary('gnocchi_swift', 'service') }}"
# RPC
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance

View File

@ -18,3 +18,6 @@ swift_service_in_ldap: "{{ service_ldap_backend_enabled }}"
# Ensure that the package state matches the global setting
swift_package_state: "{{ package_state }}"
# Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware
swift_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"