openstack/openstack-ansible-os_heat
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-02 12:33:33 +00:00 committed by Gerrit Code Review
commit 7e18852bbd
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/heat.conf.j2
View File

@ -26,7 +26,7 @@ num_engine_workers = {{ heat_engine_workers | default(api_threads) }}
## RPC Backend ## RPC Backend
rpc_backend = {{ heat_rpc_backend }} rpc_backend = {{ heat_rpc_backend }}
transport_url = rabbit://{% for host in heat_rabbitmq_servers.split(',') %}{{ heat_rabbitmq_userid }}:{{ heat_rabbitmq_password }}@{{ host }}:{{ heat_rabbitmq_port }}/{{ heat_rabbitmq_vhost }}?rabbit_use_ssl={{ heat_rabbitmq_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in heat_rabbitmq_servers.split(',') %}{{ heat_rabbitmq_userid }}:{{ heat_rabbitmq_password }}@{{ host }}:{{ heat_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ heat_rabbitmq_vhost }}{% endif %}{% endfor %}
## Plugin dirs ## Plugin dirs
plugin_dirs = {{ heat_plugin_dirs | join(',') }} plugin_dirs = {{ heat_plugin_dirs | join(',') }}
@ -62,18 +62,13 @@ bind_port = {{ heat_cfn_service_port }}
bind_port = {{ heat_watch_port }} bind_port = {{ heat_watch_port }}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_port = {{ rabbitmq_port }}
rabbit_userid = {{ heat_rabbitmq_userid }}
rabbit_password = {{ heat_rabbitmq_password }}
rabbit_virtual_host = {{ heat_rabbitmq_vhost }}
rabbit_hosts = {{ rabbitmq_servers }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }} rabbit_use_ssl = {{ rabbitmq_use_ssl }}
# Ceilometer options # Ceilometer options
{% if heat_ceilometer_enabled %} {% if heat_ceilometer_enabled %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = messagingv2
transport_url = rabbit://{% for host in heat_rabbitmq_telemetry_servers.split(',') %}{{ heat_rabbitmq_telemetry_userid }}:{{ heat_rabbitmq_telemetry_password }}@{{ host }}:{{ heat_rabbitmq_telemetry_port }}/{{ heat_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ heat_rabbitmq_telemetry_use_ssl }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in heat_rabbitmq_telemetry_servers.split(',') %}{{ heat_rabbitmq_telemetry_userid }}:{{ heat_rabbitmq_telemetry_password }}@{{ host }}:{{ heat_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ heat_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
{% endif %} {% endif %}