From 1a65676306dda31beb3abda3ed3ea1719bb534f3 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 1 Jun 2017 14:21:08 +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: Ia352ef7377e6e1f51fffb3181ad5ab422275f39a Implements: blueprint deprecate-rpc-backend --- defaults/main.yml | 1 - .../notes/remove_rpc_backend-1987334512353568.yaml | 4 ++++ templates/cloudkitty.conf.j2 | 9 +++------ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/remove_rpc_backend-1987334512353568.yaml diff --git a/defaults/main.yml b/defaults/main.yml index efdf62a..86db41b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -120,5 +120,4 @@ cloudkitty_role_project_group: cloudkitty_all # The messaging driver to use, defaults to rabbit. Other drivers # include qpid and zmq. (string value) -cloudkitty_rpc_backend: rabbit cloudkitty_database_connection: "mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_container_mysql_password }}@{{ cloudkitty_galera_address }}/{{ cloudkitty_galera_database }}?charset=utf8" diff --git a/releasenotes/notes/remove_rpc_backend-1987334512353568.yaml b/releasenotes/notes/remove_rpc_backend-1987334512353568.yaml new file mode 100644 index 0000000..12041a5 --- /dev/null +++ b/releasenotes/notes/remove_rpc_backend-1987334512353568.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - Remove ``cloudkitty_rpc_backend`` option due to deprecation of + rpc_backend option in oslo.messaging. diff --git a/templates/cloudkitty.conf.j2 b/templates/cloudkitty.conf.j2 index ce7dc2d..832b4fa 100644 --- a/templates/cloudkitty.conf.j2 +++ b/templates/cloudkitty.conf.j2 @@ -5,7 +5,9 @@ use_stderr = False debug = {{ debug }} notification_topics = {{ cloudkitty_notification_topics }} -rpc_backend = {{ cloudkitty_rpc_backend }} + +## RabbitMQ RPC +transport_url = rabbit://{% for host in cloudkitty_rabbitmq_servers.split(',') %}{{ cloudkitty_rabbitmq_userid }}:{{ cloudkitty_rabbitmq_password }}@{{ host }}:{{ cloudkitty_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ cloudkitty_rabbitmq_vhost }}{% endif %}{% endfor %} [api] port = {{ cloudkitty_service_port }} @@ -45,12 +47,7 @@ auth_section = keystone_authtoken [oslo_messaging_qpid] [oslo_messaging_rabbit] -rabbit_userid = {{ cloudkitty_rabbitmq_userid }} -rabbit_password = {{ cloudkitty_rabbitmq_password }} -rabbit_hosts = {{ cloudkitty_rabbitmq_servers }} -rabbit_virtual_host = {{ cloudkitty_rabbitmq_vhost }} ssl = {{ cloudkitty_rabbitmq_use_ssl }} -rabbit_port = {{ cloudkitty_rabbitmq_port }} [output] pipeline = {{ cloudkitty_output_pipeline }}