Update to use oslo.messaging service for RPC and Notify

Code Issues Proposed changes

This introduces oslo.messaging variables that define the RPC and
Notify transports for the OpenStack services. These parameters replace
the rabbitmq values and are used to generate the messaging
transport_url for the service. The association of the messaging
backend server to the oslo.messaging services will then be transparent
to the trove service.
This patch:
* Add oslo.messaging variables for RPC and Notify to defaults
* Update transport_url generation (add for notification)
* Add oslo.messaging to tests inventory
* Update tests
* Update docs
* Update extras
* Add release note
Change-Id: Ia01317343ae6fbc790d64b5ba282c8c069750d45

This commit is contained in:

Andrew Smith

2018年06月12日 12:00:26 -04:00

committed by Andy Smith

parent 8ebd2d73bb

commit 3c4f4127b4

10 changed files with 102 additions and 39 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7
templates/trove-conductor.conf.j2

View File

@@ -5,7 +5,7 @@ debug = {{ debug }}

trove_auth_url = {{ trove_auth_url }}

conductor_manager = trove.conductor.manager.Manager

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 %}

transport_url = {{ trove_oslomsg_rpc_transport }}://{% for host in trove_oslomsg_rpc_servers.split(',') %}{{ trove_oslomsg_rpc_userid }}:{{ trove_oslomsg_rpc_password }}@{{ host }}:{{ trove_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_rpc_vhost }}{% endif %}{% endfor %}

{# There must be a blank line above or the following line will be appended to the previous. #}

control_exchange = {{ trove_control_exchange }}

@@ -21,4 +21,7 @@ enabled = {{ trove_profiler_enabled }}

connection = "{{ trove_galera_connection_string }}"

[oslo_messaging_rabbit]

ssl={{ trove_rabbitmq_use_ssl }}

ssl={{ trove_oslomsg_rpc_use_ssl }}

[oslo_messaging_notifications]

transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}

7
templates/trove-guestagent.conf.j2

View File

@@ -6,7 +6,7 @@ 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 %}

transport_url = {{ trove_oslomsg_rpc_transport }}://{% for host in trove_oslomsg_rpc_servers.split(',') %}{{ trove_oslomsg_rpc_userid }}:{{ trove_oslomsg_rpc_password }}@{{ host }}:{{ trove_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_rpc_vhost }}{% endif %}{% endfor %}

{% if trove_swift_enabled is defined %}

swift_url = {{ trove_guest_swift_url }}

@@ -56,7 +56,10 @@ log_file = trove-guestagent.log

[oslo_messaging_rabbit]

# Connect over SSL for RabbitMQ. (boolean value)

# Deprecated group/name - [DEFAULT]/rabbit_use_ssl

ssl = {{ trove_guest_rabbitmq_use_ssl }}

ssl = {{ trove_guest_oslomsg_rpc_use_ssl }}

[oslo_messaging_notifications]

transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}

# ========== Datastore Specific Configuration Options ==========

7
templates/trove-taskmanager.conf.j2

View File

@@ -3,7 +3,7 @@

[DEFAULT]

debug = {{ debug }}

update_status_on_fail = True

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 %}

transport_url = {{ trove_oslomsg_rpc_transport }}://{% for host in trove_oslomsg_rpc_servers.split(',') %}{{ trove_oslomsg_rpc_userid }}:{{ trove_oslomsg_rpc_password }}@{{ host }}:{{ trove_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_rpc_vhost }}{% endif %}{% endfor %}

{# There must be a blank line above or the following line will be appended to the previous. #}

control_exchange = {{ trove_control_exchange }}

@@ -100,6 +100,9 @@ enabled = {{ trove_profiler_enabled }}

#trace_sqlalchemy = True

[oslo_messaging_rabbit]

ssl={{ trove_rabbitmq_use_ssl }}

ssl={{ trove_oslomsg_rpc_use_ssl }}

[oslo_messaging_notifications]

transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}

{% include 'include_db.j2' %}

7
templates/trove.conf.j2

View File

@@ -4,7 +4,7 @@ debug = {{ debug }}

bind_host = {{ trove_service_host }}

bind_port = {{ trove_service_port }}

trove_api_workers={{ trove_api_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 %}

transport_url = {{ trove_oslomsg_rpc_transport }}://{% for host in trove_oslomsg_rpc_servers.split(',') %}{{ trove_oslomsg_rpc_userid }}:{{ trove_oslomsg_rpc_password }}@{{ host }}:{{ trove_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_rpc_vhost }}{% endif %}{% endfor %}

{# There must be a blank line above or the following line will be appended to the previous. #}

control_exchange = {{ trove_control_exchange }}

@@ -116,6 +116,9 @@ enabled = {{ trove_profiler_enabled }}

#ca_file = /path/to/ca_file

[oslo_messaging_rabbit]

ssl = {{ trove_rabbitmq_use_ssl }}

ssl = {{ trove_oslomsg_rpc_use_ssl }}

[oslo_messaging_notifications]

transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}

{% include 'include_db.j2' %}