openstack
/
salt-formula-nova
Code Issues Proposed changes

Support configuration of notify_on without Ceilometer 

Change-Id: Ie8a81a38359c51ac6dc148aac98d23ddaecd878a
This commit is contained in:
Simon Pasquier 2016-12-15 10:18:39 +01:00
parent 2ee8c65d19
commit 74b092d3a7
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/files/liberty/nova-compute.conf.Debian
View File

@ -87,13 +87,18 @@ resume_guests_state_on_host_boot = True
service_down_time = 90
{% if pillar.ceilometer is defined %}
instance_usage_audit = True
instance_usage_audit_period = hour
notify_on_state_change = vm_and_task_state
{% endif %}
{%- if compute.get('notification', {}).notify_on is defined %}
{%- for key, value in compute.notification.notify_on.iteritems() %}
notify_on_{{ key }} = {{ value }}
{%- endfor %}
{%- elif pillar.ceilometer is defined %}
notify_on_state_change = vm_and_task_state
{%- endif %}
{%- if compute.notification is defined %}
notification_driver = {{ compute.notification.driver }}

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

@ -52,11 +52,17 @@ resume_guests_state_on_host_boot = True
service_down_time = 90
{% if pillar.ceilometer is defined %}
instance_usage_audit = True
instance_usage_audit_period = hour
{%- endif %}
{%- if compute.get('notification', {}).notify_on is defined %}
{%- for key, value in compute.notification.notify_on.iteritems() %}
notify_on_{{ key }} = {{ value }}
{%- endfor %}
{%- elif pillar.ceilometer is defined %}
notify_on_state_change = vm_and_task_state
{% endif %}
{%- endif %}
[oslo_concurrency]
lock_path = /var/lib/nova/tmp