From 504bffa83e95690935ff690897aa8eadc6120b9a Mon Sep 17 00:00:00 2001 From: Paulo Matias Date: Mon, 19 Sep 2016 23:29:36 -0300 Subject: [PATCH] Add Swift telemetry notification consumer to Ceilometer Related-Bug: #1624788 Change-Id: I9e17be00f55d5812c2a7a59408d902e605716690 --- playbooks/inventory/group_vars/all.yml | 3 --- playbooks/inventory/group_vars/ceilometer_all.yml | 4 ++++ playbooks/inventory/group_vars/swift_all.yml | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index d7a372be1b..1bd70cd0dd 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -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 diff --git a/playbooks/inventory/group_vars/ceilometer_all.yml b/playbooks/inventory/group_vars/ceilometer_all.yml index 57f3b2b58f..7ed2455909 100644 --- a/playbooks/inventory/group_vars/ceilometer_all.yml +++ b/playbooks/inventory/group_vars/ceilometer_all.yml @@ -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 }}" diff --git a/playbooks/inventory/group_vars/swift_all.yml b/playbooks/inventory/group_vars/swift_all.yml index 50b4c401ac..5da77c061d 100644 --- a/playbooks/inventory/group_vars/swift_all.yml +++ b/playbooks/inventory/group_vars/swift_all.yml @@ -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) }}"