Update deprecated rabbitmq messaging configuration
Current versions of OpenStack use the transport url rather than rabbit_hosts and various other configuration settings. Adding a new template for transport url and current oslo-messaging-rabbit settings. Allow the setting ssl_ca at the OpenStack principle layer. Depends-On: Ie17b481bce3e3bfdf71b15ca7667f8688739d608 Change-Id: I6bb56a59cd65310d644aa25ae203996b22ec4b4e Partial-Bug: #1807233
This commit is contained in:
parent
701cf8d2c4
commit
cb4d058c0b
|
@ -19,3 +19,8 @@ options:
|
|||
Openstack mostly defaults to using public endpoints for
|
||||
internal communication between services. If set to True this option
|
||||
will configure services to use internal endpoints where possible.
|
||||
ssl_ca:
|
||||
type: string
|
||||
default:
|
||||
description: |
|
||||
SSL CA to use to communicate with other OpenStack cloud components.
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
# This template supersedes section-rabbitmq-oslo which uses deprecated
|
||||
# settings. The section-rabbitmq-oslo will remain available until the
|
||||
# transition is complete.
|
||||
#
|
||||
# For a complete messaging queue configuration the template
|
||||
# section-transport-url must also be used under the [DEFAULT] section.
|
||||
|
||||
{% if amqp.host or amqp.hosts -%}
|
||||
[oslo_messaging_rabbit]
|
||||
|
||||
{% if amqp.ha_queues -%}
|
||||
rabbit_ha_queues = True
|
||||
rabbit_durable_queues = False
|
||||
{% endif -%}
|
||||
|
||||
{% if amqp.ssl_data_complete == True -%}
|
||||
ssl = True
|
||||
{% if amqp.ssl_ca -%}
|
||||
ssl_ca_file = {{ amqp.ssl_ca_file }}
|
||||
{% endif -%}
|
||||
{% endif -%}
|
||||
{% endif -%}
|
|
@ -0,0 +1,7 @@
|
|||
# This template must be included under the [DEFAULT] section
|
||||
|
||||
{% if amqp.transport_url -%}
|
||||
transport_url = {{ amqp.transport_url }}
|
||||
{% endif -%}
|
||||
|
||||
|
Loading…
Reference in New Issue