openstack/openstack-ansible
Code Issues Proposed changes

Add Swift telemetry notification consumer to Ceilometer

Browse Source 
Related-Bug: #1624788
Change-Id: I9e17be00f55d5812c2a7a59408d902e605716690
This commit is contained in:
Paulo Matias 2016-09-19 23:29:36 -03:00
parent 6aa4e830f9
commit 504bffa83e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/inventory/group_vars/all.yml
View File

@ -390,9 +390,6 @@ swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
swift_rabbitmq_telemetry_userid: "swift"
swift_rabbitmq_telemetry_vhost: "/swift"
swift_rabbitmq_telemetry_servers: "{{ rabbitmq_servers }}"
# TODO: (andymccr) ceilometer with swift does not support SSL rabbitmq connections, so we are hard coding the port and use_ssl var
swift_rabbitmq_telemetry_port: "5672"
swift_rabbitmq_use_ssl: False
swift_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}"
# If there are any Ceilometer and Swift hosts in the environment, then enable its usage

4
playbooks/inventory/group_vars/ceilometer_all.yml
View File

@ -21,5 +21,9 @@ ceilometer_service_in_ldap: "{{ service_ldap_backend_enabled }}"
ceilometer_aodh_enabled: "{{ groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 }}"
ceilometer_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"
# NOTE: these and their swift_all.yml counterpart should be moved back to all.yml once swift with ceilometer gets proper SSL support
swift_rabbitmq_telemetry_port: "{{ rabbitmq_port }}"
swift_rabbitmq_telemetry_use_ssl: "{{ rabbitmq_use_ssl }}"
# Ensure that the package state matches the global setting
ceilometer_package_state: "{{ package_state }}"

4
playbooks/inventory/group_vars/swift_all.yml
View File

@ -19,5 +19,9 @@ swift_service_in_ldap: "{{ service_ldap_backend_enabled }}"
# Ensure that the package state matches the global setting
swift_package_state: "{{ package_state }}"
# TODO: (andymccr) ceilometer with swift does not support SSL rabbitmq connections, so we are hard coding the port and use_ssl var
swift_rabbitmq_telemetry_port: "5672"
swift_rabbitmq_telemetry_use_ssl: False
# Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware
swift_gnocchi_enabled: "{{ (groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0) }}"