From ca9345d0358995f28ee0e94375b349b665d66e75 Mon Sep 17 00:00:00 2001 From: Alexandra Settle Date: Fri, 13 Sep 2019 09:59:50 +0100 Subject: [PATCH] Fixing broken links and removing outdated driver zmq is deprecated, removing unnecessary content Change-Id: I1009205ee8298065cece5f0cda228b06a1281f14 Backport: stein rocky Signed-off-by: Alexandra Settle Co-Authored-By: Jeremy Freudberg (cherry picked from commit 6e3e4b91c2068f7db3b360286560b1d19636856f) --- .../admin/advanced-configuration-guide.rst | 40 ++++--------------- doc/source/conf.py | 4 ++ 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/doc/source/admin/advanced-configuration-guide.rst b/doc/source/admin/advanced-configuration-guide.rst index 00fa07bab2..4124ae7cb9 100644 --- a/doc/source/admin/advanced-configuration-guide.rst +++ b/doc/source/admin/advanced-configuration-guide.rst @@ -213,39 +213,13 @@ you want to run sahara services and follow these steps: run both processes on the same or separate hosts as long as they are 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 two drivers provided: RabbitMQ -or ZeroMQ. For the RabbitMQ drivers please see the -:ref:`notification-configuration` documentation for an explanation of -common configuration options. - -For an expanded view of all the options provided by each message broker -driver in oslo.messaging please refer to the options available in the -respective source trees: - -* For Rabbit MQ see - - * 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 `_ +To configure ``oslo.messaging``, first you need to choose a message +broker driver. The recommended driver is ``RabbitMQ``. For the ``RabbitMQ`` +drivers please see the :ref:`notification-configuration` documentation +for an explanation of common configuration options; the entire list of +configuration options is found in the +:oslo.messaging-doc:`oslo_messaging_rabbit documentation +`. 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/conf.py b/doc/source/conf.py index 85a81e32c8..bddcd82c63 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -50,6 +50,10 @@ html_last_updated_fmt = '%Y-%m-%d %H:%M' config_generator_config_file = 'config-generator.conf' config_sample_basename = 'sahara' +openstack_projects = [ + 'oslo.messaging' +] + # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates']