Update Aodh integration

The Aodh integration with Ceilometer no longer relies on Ceilometer
connecting directly to an alarm storage engine to answer API calls,
when Aodh is enabled. Instead it will redirect requests related to
alarms to Aodh.

Depends-On: I440b4c8127eff2dc517d7ff8e277c6d7a5f106ce
Change-Id: I4a3f6b69b6b19118248c383c1d58c99e1a7f8262

defaults/main.yml

@@ -104,6 +104,10 @@ neutron_ceilometer_enabled: false
 heat_ceilometer_enabled: false
 keystone_ceilometer_enabled: false
 
+# Defaults to True if the service is deployed.
+ceilometer_aodh_enabled: false
+
+
 ## Keystone authentication middleware
 ceilometer_keystone_auth_plugin: password
 

releasenotes/notes/update-aodh-integration-fd2a27e8864bd8ff.yaml

@@ -0,0 +1,10 @@
+---
+upgrade:
+  - Ceilometer no longer manages alarm storage when Aodh
+    is enabled. It now redirects alarm-related requests to
+    the Aodh API. This is now auto-enabled when Aodh is
+    deployed.
+  - Overrides for ceilometer ``aodh_connection_string``
+    will no longer work. Specifying an Aodh connection
+    string in Ceilometer was deprecated within Ceilometer
+    in a prior release so this option has been removed.

templates/ceilometer.conf.j2

@@ -8,6 +8,7 @@ debug = {{ debug }}
 auth_strategy = keystone
 notification_topics = notifications
 rpc_backend = rabbit
+aodh_is_enabled = {{ ceilometer_aodh_enabled | bool }}
 
 [oslo_policy]
 policy_file = /etc/ceilometer/policy.json
@@ -77,9 +78,6 @@ messaging_urls = rabbit://{{ keystone_rabbitmq_userid }}:{{ keystone_rabbitmq_pa
 [database]
 metering_connection = {{ ceilometer_connection_string }}
 event_connection = {{ ceilometer_connection_string }}
-{% if groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 %}
-alarm_connection = {{ aodh_connection_string }}
-{% endif %}
 
 [keystone_authtoken]
 insecure = {{ keystone_service_internaluri_insecure | bool }}