openstack
/
salt-formula-nova
Code Issues Proposed changes

Merge "Support dict values for controller.notification"

This commit is contained in:
Jenkins 2017-01-04 13:36:13 +00:00 committed by Gerrit Code Review
parent 8e67e9e2e4 2ee8c65d19
commit b8272283d0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/files/mitaka/nova-compute.conf.Debian
View File

@ -56,15 +56,18 @@ service_down_time = 90
instance_usage_audit = True
instance_usage_audit_period = hour
notify_on_state_change = vm_and_task_state
notification_topics=notifications
instance_usage_audit_period=hour
{% endif %}
[oslo_concurrency]
lock_path = /var/lib/nova/tmp
[oslo_messaging_notifications]
{%- if compute.notification is defined %}
{%- if compute.notification is mapping %}
driver = {{ compute.notification.get('driver', 'messagingv2') }}
{%- if compute.notification.topics is defined %}
topics = {{ compute.notification.topics }}
{%- endif %}
{%- elif compute.notification %}
driver = messagingv2
{%- endif %}