From 77a1d2793805cce89ed7b17268159b67e2a05285 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Tue, 3 Mar 2020 19:52:21 +0100 Subject: [PATCH] Remove enable_cadf_notifications variable The variable enable_cadf_notifications is deprecated and marked for removal during the U cycle. Change-Id: I5e4d20d112db2392b55a0788f4d704ab6ca6112f --- ansible/group_vars/all.yml | 2 -- ansible/roles/keystone/defaults/main.yml | 2 +- etc/kolla/globals.yml | 2 -- ...nable-cadf-notifications-variable-5af76a972725f202.yaml | 7 +++++++ 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/remove-enable-cadf-notifications-variable-5af76a972725f202.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index e647a34ecb..865d496945 100644 --- a/ansible/group_vars/all.yml +++ b/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" diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index 8fcd8857c5..717ee20ffc 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/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: diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 9e435b8d68..c334431cd2 100644 --- a/etc/kolla/globals.yml +++ b/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" diff --git a/releasenotes/notes/remove-enable-cadf-notifications-variable-5af76a972725f202.yaml b/releasenotes/notes/remove-enable-cadf-notifications-variable-5af76a972725f202.yaml new file mode 100644 index 0000000000..3591f72861 --- /dev/null +++ b/releasenotes/notes/remove-enable-cadf-notifications-variable-5af76a972725f202.yaml @@ -0,0 +1,7 @@ +--- +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``.