openstack
/
charm-nova-compute
Code Issues Proposed changes

Merge "Update notification config >= mitaka"

This commit is contained in:
Jenkins 2017-08-04 11:41:48 +00:00 committed by Gerrit Code Review
parent b0fe401cae 6824373162
commit bd11b57f76
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/mitaka/nova.conf
View File

@ -109,8 +109,6 @@ instances_path = {{ instances_path }}
{% endif -%}
{% if enable_designate -%}
notification_driver = {{ notification_driver }}
notification_topics = {{ notification_topics }}
notify_on_state_change = {{ notify_on_state_change }}
{% endif -%}
@ -224,6 +222,8 @@ pool = {{ storage_pool }}
{% include "section-rabbitmq-oslo" %}
{% include "section-oslo-notifications" %}
{% include "parts/section-cinder" %}
[oslo_concurrency]

4
templates/ocata/nova.conf
View File

@ -109,8 +109,6 @@ instances_path = {{ instances_path }}
{% endif -%}
{% if enable_designate -%}
notification_driver = {{ notification_driver }}
notification_topics = {{ notification_topics }}
notify_on_state_change = {{ notify_on_state_change }}
{% endif -%}
@ -224,6 +222,8 @@ pool = {{ storage_pool }}
{% include "section-rabbitmq-oslo" %}
{% include "section-oslo-notifications" %}
{% include "parts/section-cinder" %}
[oslo_concurrency]