From 10ff5cb3c1f78f29decdbb603265dc918b887de0 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 23 May 2017 10:39:09 +0800 Subject: [PATCH] Deprecate rabbit_use_ssl option Option "rabbit_use_ssl" from group "oslo_messaging_rabbit" is deprecated. Use option "ssl" from group "oslo_messaging_rabbit". Change-Id: Ibbd06cb3e65bf9970b0b3de62c9e12ce5fa4f678 Implements: blueprint deprecate-rabbit-use-ssl --- templates/trove-conductor.conf.j2 | 2 +- templates/trove-guestagent.conf.j2 | 2 +- templates/trove-taskmanager.conf.j2 | 2 +- templates/trove.conf.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/trove-conductor.conf.j2 b/templates/trove-conductor.conf.j2 index 0ff7745..f223888 100644 --- a/templates/trove-conductor.conf.j2 +++ b/templates/trove-conductor.conf.j2 @@ -22,4 +22,4 @@ enabled = {{ trove_profiler_enabled }} connection = "{{ trove_galera_connection_string }}" [oslo_messaging_rabbit] -rabbit_use_ssl={{ trove_rabbitmq_use_ssl }} +ssl={{ trove_rabbitmq_use_ssl }} diff --git a/templates/trove-guestagent.conf.j2 b/templates/trove-guestagent.conf.j2 index 8127f6a..1846a83 100644 --- a/templates/trove-guestagent.conf.j2 +++ b/templates/trove-guestagent.conf.j2 @@ -69,7 +69,7 @@ rabbit_port = {{ trove_rabbitmq_port }} # Connect over SSL for RabbitMQ. (boolean value) # Deprecated group/name - [DEFAULT]/rabbit_use_ssl -rabbit_use_ssl = {{ trove_guest_rabbitmq_use_ssl }} +ssl = {{ trove_guest_rabbitmq_use_ssl }} # The RabbitMQ userid. (string value) # Deprecated group/name - [DEFAULT]/rabbit_userid diff --git a/templates/trove-taskmanager.conf.j2 b/templates/trove-taskmanager.conf.j2 index b108822..a849c38 100644 --- a/templates/trove-taskmanager.conf.j2 +++ b/templates/trove-taskmanager.conf.j2 @@ -106,6 +106,6 @@ enabled = {{ trove_profiler_enabled }} #trace_sqlalchemy = True [oslo_messaging_rabbit] -rabbit_use_ssl={{ trove_rabbitmq_use_ssl }} +ssl={{ trove_rabbitmq_use_ssl }} {% include 'include_db.j2' %} diff --git a/templates/trove.conf.j2 b/templates/trove.conf.j2 index 7449d3c..2958002 100644 --- a/templates/trove.conf.j2 +++ b/templates/trove.conf.j2 @@ -117,6 +117,6 @@ enabled = {{ trove_profiler_enabled }} #ca_file = /path/to/ca_file [oslo_messaging_rabbit] -rabbit_use_ssl = {{ trove_rabbitmq_use_ssl }} +ssl = {{ trove_rabbitmq_use_ssl }} {% include 'include_db.j2' %}