Use "rabbit_use_ssl" for ocata
Ensure "rabbit_use_ssl" is specified in the [oslo_messaging_rabbit] config section instead of "ssl" for Ocata, since "ssl" was not yet introduced. This is fixed by using section-oslo-messaging-rabbit for pike and above rather than ocata and above, and using section-rabbitmq-oslo for ocata. Change-Id: I9209a3cdc9b52a918621ad2c328e67aa616f18d6 Closes-Bug: #1838696
This commit is contained in:
parent
fb554964f2
commit
35ddec55cf
@ -6,11 +6,8 @@
|
||||
verbose = {{ options.verbose }}
|
||||
debug = {{ options.debug }}
|
||||
|
||||
# Transport URL must be in the [DEFAULT] section
|
||||
{% include "parts/section-transport-url" %}
|
||||
|
||||
# End of [DEFAULT] section
|
||||
{% include "parts/section-oslo-messaging-rabbit" %}
|
||||
{% include "parts/section-rabbitmq-oslo" %}
|
||||
|
||||
[agent]
|
||||
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
||||
|
19
src/templates/pike/neutron.conf
Normal file
19
src/templates/pike/neutron.conf
Normal file
@ -0,0 +1,19 @@
|
||||
###############################################################################
|
||||
# [ WARNING ]
|
||||
# Configuration file maintained by Juju. Local changes may be overwritten.
|
||||
###############################################################################
|
||||
[DEFAULT]
|
||||
verbose = {{ options.verbose }}
|
||||
debug = {{ options.debug }}
|
||||
|
||||
# Transport URL must be in the [DEFAULT] section
|
||||
{% include "parts/section-transport-url" %}
|
||||
|
||||
# End of [DEFAULT] section
|
||||
{% include "parts/section-oslo-messaging-rabbit" %}
|
||||
|
||||
[agent]
|
||||
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
||||
|
||||
[oslo_concurrency]
|
||||
lock_path = /var/lock/neutron
|
Loading…
x
Reference in New Issue
Block a user