From 4d3ae78c027e9d771dac336896c9a5369340f5ab Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 1 Jun 2017 15:46:28 +0800 Subject: [PATCH] Deprecate rpc_backend option Option "rpc_backend" from group "DEFAULT" is deprecated for removal (Replaced by [DEFAULT]/transport_url). Its value may be silently ignored in the future. Change-Id: Ia0c175746a5bdd0f8c722ab214719e77160a0e12 Implements: blueprint deprecate-rpc-backend --- defaults/main.yml | 1 - .../remove_rpc_backend-78139a469235891f.yaml | 5 ++++ templates/trove-conductor.conf.j2 | 1 - templates/trove-guestagent.conf.j2 | 29 ++----------------- templates/trove-taskmanager.conf.j2 | 1 - templates/trove.conf.j2 | 1 - 6 files changed, 7 insertions(+), 31 deletions(-) create mode 100644 releasenotes/notes/remove_rpc_backend-78139a469235891f.yaml diff --git a/defaults/main.yml b/defaults/main.yml index f80cfa1..baf3863 100644 --- a/defaults/main.yml +++ b/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 diff --git a/releasenotes/notes/remove_rpc_backend-78139a469235891f.yaml b/releasenotes/notes/remove_rpc_backend-78139a469235891f.yaml new file mode 100644 index 0000000..d1ce017 --- /dev/null +++ b/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. diff --git a/templates/trove-conductor.conf.j2 b/templates/trove-conductor.conf.j2 index f223888..7842df7 100644 --- a/templates/trove-conductor.conf.j2 +++ b/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 %} diff --git a/templates/trove-guestagent.conf.j2 b/templates/trove-guestagent.conf.j2 index 1846a83..3b1598d 100644 --- a/templates/trove-guestagent.conf.j2 +++ b/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] diff --git a/templates/trove-taskmanager.conf.j2 b/templates/trove-taskmanager.conf.j2 index a849c38..639e83d 100644 --- a/templates/trove-taskmanager.conf.j2 +++ b/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. #} diff --git a/templates/trove.conf.j2 b/templates/trove.conf.j2 index 2958002..fb36381 100644 --- a/templates/trove.conf.j2 +++ b/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. #}