From 38d46827544daf3cb4c356594a7717c224b879bd Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 1 Jun 2017 15:20:10 +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: I63c95f5e36669ffdd9eb63c8294138aea265a782 Implements: blueprint deprecate-rpc-backend --- defaults/main.yml | 1 - .../notes/remove_rpc_backend-9813a3455f234521.yaml | 5 +++++ templates/magnum.conf.j2 | 7 +------ 3 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 16c99220..e0924a9e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml b/releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml new file mode 100644 index 00000000..d7d498e2 --- /dev/null +++ b/releasenotes/notes/remove_rpc_backend-9813a3455f234521.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Remove ``magnum_rpc_backend`` option due to deprecation of + rpc_backend option in oslo.messaging. diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 150cae9a..ff0225f3 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -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