Merge "Messaging multi-backend support"
This commit is contained in:
commit
609b4a394f
|
@ -10,8 +10,6 @@ osapi_compute_listen_port = {{ nova.api_port.cont }}
|
||||||
metadata_listen = {{ network_topology["private"]["address"] }}
|
metadata_listen = {{ network_topology["private"]["address"] }}
|
||||||
metadata_listen_port = {{ nova.metadata.port.cont }}
|
metadata_listen_port = {{ nova.metadata.port.cont }}
|
||||||
|
|
||||||
transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq') }}
|
|
||||||
|
|
||||||
use_neutron = true
|
use_neutron = true
|
||||||
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
||||||
scheduler_max_attempts = 10
|
scheduler_max_attempts = 10
|
||||||
|
@ -78,17 +76,6 @@ admin_tenant_name = service
|
||||||
api_endpoint = http://{{ address('ironic-api') }}:{{ ironic_api_port }}/v1
|
api_endpoint = http://{{ address('ironic-api') }}:{{ ironic_api_port }}/v1
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
[oslo_messaging_notifications]
|
|
||||||
{% if searchlight is defined and searchlight.services.nova %}
|
|
||||||
driver = {{ searchlight.notification_driver }}
|
|
||||||
notify_on_state_change = vm_and_task_state
|
|
||||||
{% else %}
|
|
||||||
driver = noop
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
[oslo_messaging_rabbit]
|
|
||||||
rabbit_ha_queues = false
|
|
||||||
|
|
||||||
[oslo_concurrency]
|
[oslo_concurrency]
|
||||||
lock_path = /var/lib/nova/tmp
|
lock_path = /var/lib/nova/tmp
|
||||||
|
|
||||||
|
@ -179,3 +166,13 @@ compute = auto
|
||||||
|
|
||||||
[wsgi]
|
[wsgi]
|
||||||
api_paste_config = /etc/nova/api-paste.ini
|
api_paste_config = /etc/nova/api-paste.ini
|
||||||
|
|
||||||
|
[oslo_messaging_notifications]
|
||||||
|
{% if searchlight is defined and searchlight.services.nova %}
|
||||||
|
driver = {{ searchlight.notification_driver }}
|
||||||
|
notify_on_state_change = vm_and_task_state
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{# messaging macros templates #}
|
||||||
|
{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
|
||||||
|
{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
|
||||||
|
|
|
@ -33,6 +33,8 @@ service:
|
||||||
- nova-db-migrations
|
- nova-db-migrations
|
||||||
- nova-libvirt:local
|
- nova-libvirt:local
|
||||||
- nova-conductor
|
- nova-conductor
|
||||||
|
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||||
|
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||||
files:
|
files:
|
||||||
- nova.conf
|
- nova.conf
|
||||||
# {% if nova.libvirt.tls_enable %}
|
# {% if nova.libvirt.tls_enable %}
|
||||||
|
|
|
@ -10,6 +10,8 @@ service:
|
||||||
- nova.conf
|
- nova.conf
|
||||||
dependencies:
|
dependencies:
|
||||||
- nova-db-migrations
|
- nova-db-migrations
|
||||||
|
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||||
|
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||||
files:
|
files:
|
||||||
nova.conf:
|
nova.conf:
|
||||||
path: /etc/nova/nova.conf
|
path: /etc/nova/nova.conf
|
||||||
|
|
|
@ -10,6 +10,8 @@ service:
|
||||||
- nova.conf
|
- nova.conf
|
||||||
dependencies:
|
dependencies:
|
||||||
- nova-db-migrations
|
- nova-db-migrations
|
||||||
|
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||||
|
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||||
files:
|
files:
|
||||||
nova.conf:
|
nova.conf:
|
||||||
path: /etc/nova/nova.conf
|
path: /etc/nova/nova.conf
|
||||||
|
|
Loading…
Reference in New Issue