Merge "Remove enable_cadf_notifications variable"

ansible/group_vars/all.yml

@@ -542,8 +542,6 @@ enable_haproxy_memcached: "no"
 enable_aodh: "no"
 enable_barbican: "no"
 enable_blazar: "no"
-# NOTE: This variable has been deprecated and will be removed in the U cycle.
-enable_cadf_notifications: "no"
 enable_ceilometer: "no"
 enable_ceilometer_ipmi: "no"
 enable_cells: "no"

ansible/roles/keystone/defaults/main.yml

@@ -118,7 +118,7 @@ keystone_source_version: "{{ kolla_source_version }}"
 ####################
 # Notifications
 ####################
-keystone_default_notifications_topic_enabled: "{{ (enable_ceilometer | bool ) or (enable_cadf_notifications | bool)}}"
+keystone_default_notifications_topic_enabled: "{{ enable_ceilometer | bool }}"
 keystone_default_notifications_topic_name: "notifications"
 
 keystone_notification_topics:

etc/kolla/globals.yml

@@ -226,8 +226,6 @@
 #enable_aodh: "no"
 #enable_barbican: "no"
 #enable_blazar: "no"
-# NOTE: This variable has been deprecated and will be removed in the U cycle.
-#enable_cadf_notifications: "no"
 #enable_ceilometer: "no"
 #enable_ceilometer_ipmi: "no"
 #enable_cells: "no"

releasenotes/notes/remove-enable-cadf-notifications-variable-5af76a972725f202.yaml

+---
+upgrade:
+  - |
+    The ``enable_cadf_notifications`` variable was removed. CADF is the
+    default notification format in keystone. To enable keystone notifications,
+    users can now set ``keystone_default_notifications_topic_enabled`` to
+    ``yes`` or enable Ceilometer via ``enable_ceilometer``.