From ba594a6a7962f72d45b2937ba44b7d0e57c9bf7b Mon Sep 17 00:00:00 2001 From: Fang Jinxing Date: Tue, 8 Dec 2015 11:50:45 +0800 Subject: [PATCH] remove the qpid message driver from the configuration file From the Mitaka realese, the qpid is no longed supported,remove it in the configuration guide. Change-Id: I8c83b3949a7056f2a624198f8140ac2ba7e67796 --- .../userdoc/advanced.configuration.guide.rst | 33 +++++++++++-------- doc/source/userdoc/configuration.guide.rst | 23 +------------ 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/doc/source/userdoc/advanced.configuration.guide.rst b/doc/source/userdoc/advanced.configuration.guide.rst index 32130e93..26d9789d 100644 --- a/doc/source/userdoc/advanced.configuration.guide.rst +++ b/doc/source/userdoc/advanced.configuration.guide.rst @@ -156,8 +156,8 @@ you want to run sahara services and follow these steps: configured to use the same message broker and database. To configure oslo.messaging, first you will need to choose a message -broker driver. Currently there are three drivers provided: RabbitMQ, Qpid -or ZeroMQ. For the RabbitMQ or Qpid drivers please see the +broker driver. Currently there are two drivers provided: RabbitMQ +or ZeroMQ. For the RabbitMQ drivers please see the :ref:`notification-configuration` documentation for an explanation of common configuration options. @@ -167,20 +167,27 @@ respective source trees: * For Rabbit MQ see - * rabbit_opts variable in `impl_rabbit.py `_ - * amqp_opts variable in `amqp.py `_ - - * For Qpid see - - * qpid_opts variable in `impl_qpid.py `_ - * amqp_opts variable in `amqp.py `_ + * rabbit_opts variable in `impl_rabbit.py `_ + * amqp_opts variable in `amqp.py `_ * For Zmq see - * zmq_opts variable in `impl_zmq.py `_ - * matchmaker_opts variable in `matchmaker.py `_ - * matchmaker_redis_opts variable in `matchmaker_redis.py `_ - * matchmaker_opts variable in `matchmaker_ring.py `_ + * zmq_opts variable in `impl_zmq.py `_ + * matchmaker_opts variable in `matchmaker.py `_ + * matchmaker_redis_opts variable in `matchmaker_redis.py `_ + * matchmaker_opts variable in `matchmaker_ring.py `_ These options will also be present in the generated sample configuration file. For instructions on creating the configuration file please see the diff --git a/doc/source/userdoc/configuration.guide.rst b/doc/source/userdoc/configuration.guide.rst index 2d12368e..a8f816ba 100644 --- a/doc/source/userdoc/configuration.guide.rst +++ b/doc/source/userdoc/configuration.guide.rst @@ -144,8 +144,7 @@ should be set in the ``[DEFAULT]`` section of the configuration file: notification_driver = messaging .. -By default sahara is configured to use RabbitMQ as its message broker, -but it can be configured to use Qpid instead if needed. +By default sahara is configured to use RabbitMQ as its message broker. If you are using RabbitMQ as the message broker, then you should set the following parameter in the ``[DEFAULT]`` section: @@ -170,26 +169,6 @@ adjustment: rabbit_virtual_host=/ .. -If you are using Qpid as the message broker, then you should -set the ``rpc_backend`` as follows: - -.. sourcecode:: cfg - - rpc_backend = qpid -.. - -You may also need to adjust the following default connection parameters -in the ``[oslo_messaging_qpid]`` section: - -.. sourcecode:: cfg - - qpid_hostname=localhost - qpid_port=5672 - qpid_hosts=$qpid_hostname:$qpid_port - qpid_username= - qpid_password= -.. - .. _orchestration-configuration: Orchestration configuration