openstack/kolla-ansible
Code Issues Proposed changes

Merge "Nova oslo_messaging_notifications config error"

Browse Source
This commit is contained in:
Jenkins 2017-06-12 07:07:05 +00:00 committed by Gerrit Code Review
commit cd762e8efb
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/nova/defaults/main.yml
View File

@ -239,3 +239,14 @@ openstack_placement_auth: "{{ openstack_auth }}"
nova_ssh_port: "8022"
####################
# Notification
####################
nova_notification_topics:
- name: notifications
enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool }}"
- name: notifications_designate
enabled: "{{ enable_designate | bool }}"
nova_enabled_notification_topics: "{{ nova_notification_topics | selectattr('enabled', 'equalto', true) | list }}"

5
ansible/roles/nova/templates/nova.conf.j2
View File

@ -201,10 +201,9 @@ rbd_secret_uuid = {{ rbd_secret_uuid }}
compute = auto
[oslo_messaging_notifications]
{% if enable_ceilometer | bool or enable_searchlight | bool or enable_designate | bool %}
{% if nova_enabled_notification_topics %}
driver = messagingv2
{% set topics=["notifications" if enable_ceilometer | bool else "", "notifications_designate" if enable_designate | bool else ""] %}
topics = {{ topics|reject("equalto", "")|list|join(",") }}
topics = {{ nova_enabled_notification_topics | map(attribute='name') | join(',') }}
{% else %}
driver = noop
{% endif %}