Merge "Configure vitrage notification topic"

ansible/roles/aodh/defaults/main.yml

@@ -75,6 +75,17 @@ aodh_database_name: "aodh"
 aodh_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}aodh{% endif %}"
 aodh_database_address: "{{ database_address }}:{{ database_port }}"
 
+####################
+# Notification
+####################
+aodh_notification_topics:
+  - name: notifications
+    enabled: "{{ enable_ceilometer | bool }}"
+  - name: vitrage_notifications
+    enabled: "{{ enable_vitrage | bool }}"
+
+aodh_enabled_notification_topics: "{{ aodh_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
+
 ####################
 # Docker
 ####################

ansible/roles/aodh/templates/aodh.conf.j2

@@ -47,8 +47,10 @@ interface = internal
 
 [oslo_messaging_notifications]
 transport_url = {{ notify_transport_url }}
-{% if enable_ceilometer | bool %}
+{% if aodh_enabled_notification_topics %}
 driver = messagingv2
-topics = notifications
+topics = {{ aodh_enabled_notification_topics | map(attribute='name') | join(',') }}
+{% else %}
+driver = noop
 {% endif %}
 

ansible/roles/cinder/defaults/main.yml

@@ -193,6 +193,17 @@ cinder_backends:
 
 cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}"
 
+####################
+# Notification
+####################
+cinder_notification_topics:
+  - name: notifications
+    enabled: "{{ enable_ceilometer | bool }}"
+  - name: vitrage_notifications
+    enabled: "{{ enable_vitrage | bool }}"
+
+cinder_enabled_notification_topics: "{{ cinder_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
+
 #############################################
 # Hitachi NAS Platform iSCSI and NFS drivers
 #############################################

ansible/roles/cinder/templates/cinder.conf.j2

@@ -61,9 +61,9 @@ transport_url = {{ rpc_transport_url }}
 
 [oslo_messaging_notifications]
 transport_url = {{ notify_transport_url }}
-{% if enable_ceilometer | bool or enable_searchlight | bool %}
+{% if cinder_enabled_notification_topics %}
 driver = messagingv2
-topics = notifications
+topics = {{ cinder_enabled_notification_topics | map(attribute='name') | join(',') }}
 {% else %}
 driver = noop
 {% endif %}

ansible/roles/neutron/defaults/main.yml

@@ -377,6 +377,8 @@ neutron_notification_topics:
     enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool or enable_neutron_infoblox_ipam_agent | bool }}"
   - name: notifications_designate
     enabled: "{{ enable_designate | bool }}"
+  - name: vitrage_notifications
+    enabled: "{{ enable_vitrage | bool }}"
 
 neutron_enabled_notification_topics: "{{ neutron_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
 

ansible/roles/nova/defaults/main.yml

@@ -386,6 +386,8 @@ nova_notification_topics:
     enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool or enable_neutron_infoblox_ipam_agent | bool }}"
   - name: notifications_designate
     enabled: "{{ enable_designate | bool }}"
+  - name: vitrage_notifications
+    enabled: "{{ enable_vitrage | bool }}"
 
 nova_enabled_notification_topics: "{{ nova_notification_topics | selectattr('enabled', 'equalto', true) | list }}"