openstack/kolla-ansible
Code Issues Proposed changes

Merge "Notification needed for searchlight"

Browse Source
This commit is contained in:
Jenkins 2016-11-27 14:29:44 +00:00 committed by Gerrit Code Review
commit 1c09a1fab7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -45,7 +45,7 @@ auth_strategy = keystone
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool or enable_searchlight | bool %}
driver = messagingv2 driver = messagingv2
{% endif %} {% endif %}

2
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -71,7 +71,7 @@ filesystem_store_datadir = /var/lib/glance/images/
{% endif %} {% endif %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool or enable_searchlight | bool %}
driver = messagingv2 driver = messagingv2
{% else %} {% else %}
driver = noop driver = noop

2
ansible/roles/glance/templates/glance-registry.conf.j2
View File

@ -45,7 +45,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
flavor = keystone flavor = keystone
[oslo_messaging_notifications] [oslo_messaging_notifications]
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool or enable_searchlight | bool %}
driver = messagingv2 driver = messagingv2
{% else %} {% else %}
driver = noop driver = noop

2
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -91,7 +91,7 @@ memcached_servers = {% for host in groups['memcached'] %}{% if orchestration_eng
{% endif %} {% endif %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool or enable_searchlight | bool %}
driver = messagingv2 driver = messagingv2
topics = notifications topics = notifications
{% else %} {% else %}

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

@ -52,7 +52,7 @@ compute_driver = libvirt.LibvirtDriver
# Though my_ip is not used directly, lots of other variables use $my_ip # Though my_ip is not used directly, lots of other variables use $my_ip
my_ip = {{ api_interface_address }} my_ip = {{ api_interface_address }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool or enable_searchlight | bool %}
instance_usage_audit = True instance_usage_audit = True
instance_usage_audit_period = hour instance_usage_audit_period = hour
notify_on_state_change = vm_and_task_state notify_on_state_change = vm_and_task_state
@ -187,7 +187,7 @@ rbd_secret_uuid = {{ rbd_secret_uuid }}
compute = auto compute = auto
[oslo_messaging_notifications] [oslo_messaging_notifications]
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool or enable_searchlight | bool %}
driver = messagingv2 driver = messagingv2
topics = notifications topics = notifications
{% else %} {% else %}