openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Fix bug in RPC config that broke Rabbit SSL support"

Browse Source
This commit is contained in:
Jenkins 2016-08-03 01:53:40 +00:00 committed by Gerrit Code Review
commit 106ca720d6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/nova.conf.j2
View File

@ -77,7 +77,8 @@ osapi_compute_workers = {{ nova_osapi_compute_workers | default(api_threads) }}
# Rpc all # Rpc all
rpc_backend = {{ nova_rpc_backend }} rpc_backend = {{ nova_rpc_backend }}
transport_url = rabbit://{% for host in nova_rabbitmq_servers.split(',') %}{{ nova_rabbitmq_userid }}:{{ nova_rabbitmq_password }}@{{ host }}:{{ nova_rabbitmq_port }}/{{ nova_rabbitmq_vhost }}?rabbit_use_ssl={{ nova_rabbitmq_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in nova_rabbitmq_servers.split(',') %}{{ nova_rabbitmq_userid }}:{{ nova_rabbitmq_password }}@{{ host }}:{{ nova_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ nova_rabbitmq_vhost }}{% endif %}{% endfor %}
executor_thread_pool_size = {{ nova_rpc_thread_pool_size }} executor_thread_pool_size = {{ nova_rpc_thread_pool_size }}
rpc_conn_pool_size = {{ nova_rpc_conn_pool_size }} rpc_conn_pool_size = {{ nova_rpc_conn_pool_size }}
rpc_response_timeout = {{ nova_rpc_response_timeout }} rpc_response_timeout = {{ nova_rpc_response_timeout }}
@ -127,7 +128,7 @@ notify_on_state_change = vm_and_task_state
{% if nova_ceilometer_enabled %} {% if nova_ceilometer_enabled %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = messagingv2
transport_url = rabbit://{% for host in nova_rabbitmq_telemetry_servers.split(',') %}{{ nova_rabbitmq_telemetry_userid }}:{{ nova_rabbitmq_telemetry_password }}@{{ host }}:{{ nova_rabbitmq_telemetry_port }}/{{ nova_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ nova_rabbitmq_telemetry_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in nova_rabbitmq_telemetry_servers.split(',') %}{{ nova_rabbitmq_telemetry_userid }}:{{ nova_rabbitmq_telemetry_password }}@{{ host }}:{{ nova_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ nova_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
{% endif %} {% endif %}
# Cache # Cache
@ -243,11 +244,6 @@ lock_path = /var/lock/nova
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_port = {{ nova_rabbitmq_port }}
rabbit_userid = {{ nova_rabbitmq_userid }}
rabbit_password = {{ nova_rabbitmq_password }}
rabbit_virtual_host = {{ nova_rabbitmq_vhost }}
rabbit_hosts = {{ nova_rabbitmq_servers }}
rabbit_use_ssl = {{ nova_rabbitmq_use_ssl }} rabbit_use_ssl = {{ nova_rabbitmq_use_ssl }}
{% if nova_virt_type == 'ironic' %} {% if nova_virt_type == 'ironic' %}