From f41adc7e8b3fb598aee630f1009806b3212b7574 Mon Sep 17 00:00:00 2001 From: Dao Cong Tien Date: Wed, 10 Oct 2018 12:13:11 +0700 Subject: [PATCH] Remove uses of rpc_backend (oslo_config) As rpc_backend config option has been removed from oslo_config [1], projects should not use it. Current uses of it cause watcher crash when installing via devstack. [1] https://review.openstack.org/#/c/580910/ Change-Id: Iba7471e87e8935f1ea02b363f269e9debdc7cc71 --- doc/source/configuration/configuring.rst | 4 ---- watcher/common/service.py | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/source/configuration/configuring.rst b/doc/source/configuration/configuring.rst index 4ec900bbb..326c0bc42 100644 --- a/doc/source/configuration/configuring.rst +++ b/doc/source/configuration/configuring.rst @@ -239,10 +239,6 @@ so that the watcher service is configured for your needs. [DEFAULT] - # The messaging driver to use, defaults to rabbit. Other drivers - # include qpid and zmq. (string value) - #rpc_backend = rabbit - # The default exchange under which topics are scoped. May be # overridden by an exchange name specified in the transport_url # option. (string value) diff --git a/watcher/common/service.py b/watcher/common/service.py index c184c8ec0..2e2254146 100644 --- a/watcher/common/service.py +++ b/watcher/common/service.py @@ -265,8 +265,7 @@ class Service(service.ServiceBase): allow_requeue=False, pool=CONF.host) def start(self): - LOG.debug("Connecting to '%s' (%s)", - CONF.transport_url, CONF.rpc_backend) + LOG.debug("Connecting to '%s'", CONF.transport_url) if self.conductor_topic_handler: self.conductor_topic_handler.start() if self.notification_handler: @@ -275,8 +274,7 @@ class Service(service.ServiceBase): self.heartbeat.start() def stop(self): - LOG.debug("Disconnecting from '%s' (%s)", - CONF.transport_url, CONF.rpc_backend) + LOG.debug("Disconnecting from '%s'", CONF.transport_url) if self.conductor_topic_handler: self.conductor_topic_handler.stop() if self.notification_handler: