openstack/openstack-ansible-os_magnum
Code Issues Proposed changes

Merge "Deprecate rpc_backend option"

Browse Source
This commit is contained in:
Jenkins 2017-06-12 16:43:16 +00:00 committed by Gerrit Code Review
commit f5a6cbbe12
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -72,7 +72,6 @@ magnum_galera_database_name: magnum_service
magnum_galera_user: magnum
# Rabbit vars
magnum_rpc_backend: rabbit
magnum_rabbitmq_userid: magnum
magnum_rabbitmq_vhost: /magnum
magnum_rabbitmq_servers: 127.0.0.1

5
releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml Normal file
View File

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

7
templates/magnum.conf.j2
View File

@ -3,7 +3,7 @@
use_stderr = False
debug = {{ debug }}
host = {{ ansible_host }}
rpc_backend = {{ magnum_rpc_backend }}
transport_url = rabbit://{% for host in magnum_rabbitmq_servers.split(',') %}{{ magnum_rabbitmq_userid }}:{{ magnum_rabbitmq_password }}@{{ host }}:{{ magnum_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ magnum_rabbitmq_vhost }}{% endif %}{% endfor %}
[api]
host = {{ ansible_host }}
@ -54,12 +54,7 @@ endpoint_type = internalURL
endpoint_type = internalURL
[oslo_messaging_rabbit]
rabbit_port = {{ magnum_rabbitmq_port }}
rabbit_hosts = {{ magnum_rabbitmq_servers }}
ssl = {{ magnum_rabbitmq_use_ssl }}
rabbit_userid = {{ magnum_rabbitmq_userid }}
rabbit_password = {{ magnum_rabbitmq_password }}
rabbit_virtual_host = {{ magnum_rabbitmq_vhost }}
rabbit_notification_exchange = magnum
rabbit_notification_topic = notification