From 972e8b515a4a099a34354bbef3d494351f2691b1 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 1 Jun 2017 14:53:16 +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: I77bb1e7f9513593cecf2ca95b9e2fa91e251b483 Implements: blueprint deprecate-rpc-backend --- defaults/main.yml | 1 - releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml | 5 +++++ templates/heat.conf.j2 | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 786bd3f..805b94b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -54,7 +54,6 @@ heat_galera_database: heat ## RabbitMQ info ## Configuration for RPC communications -heat_rpc_backend: heat.openstack.common.rpc.impl_kombu heat_rabbitmq_userid: heat heat_rabbitmq_vhost: /heat heat_rabbitmq_servers: 127.0.0.1 diff --git a/releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml b/releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml new file mode 100644 index 0000000..230a51d --- /dev/null +++ b/releasenotes/notes/remove_rpc_backend-1163da2fe9418315.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Remove ``heat_rpc_backend`` option due to deprecation of + rpc_backend option in oslo.messaging. diff --git a/templates/heat.conf.j2 b/templates/heat.conf.j2 index 4642703..9cfd342 100644 --- a/templates/heat.conf.j2 +++ b/templates/heat.conf.j2 @@ -24,7 +24,6 @@ auth_encryption_key = {{ heat_auth_encryption_key }} num_engine_workers = {{ heat_engine_workers | default(heat_api_threads) }} ## RPC Backend -rpc_backend = {{ heat_rpc_backend }} transport_url = rabbit://{% for host in heat_rabbitmq_servers.split(',') %}{{ heat_rabbitmq_userid }}:{{ heat_rabbitmq_password }}@{{ host }}:{{ heat_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ heat_rabbitmq_vhost }}{% endif %}{% endfor %} ## Plugin dirs