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
2017-05-23 10:39:09 +08:00
parent cec3b715d1
commit 10ff5cb3c1
4 changed files with 4 additions and 4 deletions
--- 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 }}
--- 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
--- 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' %}
--- 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' %}