Merge "Deprecate rpc_backend option"

defaults/main.yml

@@ -122,7 +122,6 @@ trove_db_sync_options:
 trove_galera_connection_string: "mysql+pymysql://{{ trove_galera_user}}:{{ trove_galera_password }}@{{ trove_galera_address }}/{{ trove_galera_database_name }}?charset=utf8"
 
 # Rabbit vars
-trove_rpc_backend: rabbit
 trove_control_exchange: trove
 trove_rabbit_notification_topic: notification
 trove_rabbitmq_userid: trove

releasenotes/notes/remove_rpc_backend-78139a469235891f.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``trove_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.

templates/trove-conductor.conf.j2

@@ -4,7 +4,6 @@
 debug = {{ debug }}
 trove_auth_url = {{ trove_auth_url }}
 conductor_manager = trove.conductor.manager.Manager
-rpc_backend={{ trove_rpc_backend }}
 trove_conductor_workers={{ trove_conductor_workers }}
 transport_url = rabbit://{% for host in trove_rabbitmq_servers.split(',') %}{{ trove_rabbitmq_userid }}:{{ trove_rabbitmq_password }}@{{ host }}:{{ trove_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ trove_rabbitmq_vhost }}{% endif %}{% endfor %}
 

templates/trove-guestagent.conf.j2

@@ -1,12 +1,13 @@
 # {{ ansible_managed }}
 [DEFAULT]
-rpc_backend = {{ trove_rpc_backend }}
 control_exchange = {{ trove_control_exchange }}
 trove_auth_url = {{ trove_guest_auth_url }}
 nova_proxy_admin_user = {{ trove_service_user_name }}
 nova_proxy_admin_pass = {{ trove_service_password }}
 nova_proxy_admin_tenant_name = {{ trove_service_project_name }}
 
+transport_url = rabbit://{% for host in trove_rabbitmq_servers.split(',') %}{{ trove_rabbitmq_userid }}:{{ trove_rabbitmq_password }}@{{ host }}:{{ trove_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ trove_rabbitmq_vhost }}{% endif %}{% endfor %}
+
 {% if trove_swift_enabled is defined %}
 swift_url = {{ trove_guest_swift_url }}
 # Region name of this node. Default value is None.
@@ -53,36 +54,10 @@ log_file = trove-guestagent.log
 #trace_sqlalchemy = True
 
 [oslo_messaging_rabbit]
-{% if trove_guest_rabbitmq_servers.split(',') | length > 1 %}
-# RabbitMQ HA cluster host:port pairs. (list value)
-# Deprecated group/name - [DEFAULT]/rabbit_hosts
-rabbit_hosts={% for host in trove_guest_rabbitmq_servers.split(',') %}{{ host }}:{{ trove_rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
-{% else %}
-# The RabbitMQ broker address where a single node is used. (string value)
-# Deprecated group/name - [DEFAULT]/rabbit_host
-rabbit_host = {{ trove_guest_rabbitmq_servers }}
-
-# The RabbitMQ broker port where a single node is used. (integer value)
-# Deprecated group/name - [DEFAULT]/rabbit_port
-rabbit_port = {{ trove_rabbitmq_port }}
-{% endif %}
-
 # Connect over SSL for RabbitMQ. (boolean value)
 # Deprecated group/name - [DEFAULT]/rabbit_use_ssl
 ssl = {{ trove_guest_rabbitmq_use_ssl }}
 
-# The RabbitMQ userid. (string value)
-# Deprecated group/name - [DEFAULT]/rabbit_userid
-rabbit_userid = {{ trove_rabbitmq_userid }}
-
-# The RabbitMQ password. (string value)
-# Deprecated group/name - [DEFAULT]/rabbit_password
-rabbit_password = {{ trove_rabbitmq_password }}
-
-# The RabbitMQ virtual host. (string value)
-# Deprecated group/name - [DEFAULT]/rabbit_virtual_host
-rabbit_virtual_host= {{ trove_rabbitmq_vhost }}
-
 # ========== Datastore Specific Configuration Options ==========
 
 [mysql]

templates/trove-taskmanager.conf.j2

@@ -3,7 +3,6 @@
 [DEFAULT]
 debug = {{ debug }}
 update_status_on_fail = True
-rpc_backend={{ trove_rpc_backend }}
 transport_url = rabbit://{% for host in trove_rabbitmq_servers.split(',') %}{{ trove_rabbitmq_userid }}:{{ trove_rabbitmq_password }}@{{ host }}:{{ trove_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ trove_rabbitmq_vhost }}{% endif %}{% endfor %}
 
 {# There must be a blank line above or the following line will be appended to the previous. #}

templates/trove.conf.j2

@@ -4,7 +4,6 @@ debug = {{ debug }}
 bind_host = {{ trove_service_host }}
 bind_port = {{ trove_service_port }}
 trove_api_workers={{ trove_api_workers }}
-rpc_backend={{ trove_rpc_backend }}
 transport_url = rabbit://{% for host in trove_rabbitmq_servers.split(',') %}{{ trove_rabbitmq_userid }}:{{ trove_rabbitmq_password }}@{{ host }}:{{ trove_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ trove_rabbitmq_vhost }}{% endif %}{% endfor %}
 
 {# There must be a blank line above or the following line will be appended to the previous. #}