From a6bac3758cc4af00a30fc455f44b99e1079b4ae7 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 29 Nov 2015 16:42:42 +0100 Subject: [PATCH] [config-ref] Add manila RPC section Split out the tables and create extra section for RPC - like it's done for other services. Change-Id: I038dcf9761031a507fcfb8097bebef9b928c9538 --- .../source/shared-file-systems.rst | 1 + .../source/shared-file-systems/misc.rst | 13 ++++--------- .../source/shared-file-systems/rpc.rst | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 doc/config-ref-rst/source/shared-file-systems/rpc.rst diff --git a/doc/config-ref-rst/source/shared-file-systems.rst b/doc/config-ref-rst/source/shared-file-systems.rst index 4feced022c..9e65baaf52 100644 --- a/doc/config-ref-rst/source/shared-file-systems.rst +++ b/doc/config-ref-rst/source/shared-file-systems.rst @@ -11,5 +11,6 @@ you can configure by using these instructions. shared-file-systems/drivers.rst shared-file-systems/log-files.rst shared-file-systems/sample-configuration-files.rst + shared-file-systems/rpc.rst shared-file-systems/misc.rst tables/conf-changes/manila.rst diff --git a/doc/config-ref-rst/source/shared-file-systems/misc.rst b/doc/config-ref-rst/source/shared-file-systems/misc.rst index 806c0ead7b..1daff867ac 100644 --- a/doc/config-ref-rst/source/shared-file-systems/misc.rst +++ b/doc/config-ref-rst/source/shared-file-systems/misc.rst @@ -1,10 +1,9 @@ -===================== -Configuration options -===================== +================== +Additional options +================== -These following options can be set in the ``manila.conf`` file. +These options can also be set in the ``manila.conf`` file. -.. include:: ../tables/manila-amqp.rst .. include:: ../tables/manila-api.rst .. include:: ../tables/manila-auth_token.rst .. include:: ../tables/manila-auth.rst @@ -16,15 +15,11 @@ These following options can be set in the ``manila.conf`` file. .. include:: ../tables/manila-ganesha.rst .. include:: ../tables/manila-hds_hnas.rst .. include:: ../tables/manila-logging.rst -.. include:: ../tables/manila-qpid.rst .. include:: ../tables/manila-quobyte.rst .. include:: ../tables/manila-quota.rst -.. include:: ../tables/manila-rabbitmq.rst .. include:: ../tables/manila-redis.rst -.. include:: ../tables/manila-rpc.rst .. include:: ../tables/manila-san.rst .. include:: ../tables/manila-scheduler.rst .. include:: ../tables/manila-share.rst .. include:: ../tables/manila-winrm.rst -.. include:: ../tables/manila-zeromq.rst .. include:: ../tables/manila-zfssa.rst diff --git a/doc/config-ref-rst/source/shared-file-systems/rpc.rst b/doc/config-ref-rst/source/shared-file-systems/rpc.rst new file mode 100644 index 0000000000..f2e113b04e --- /dev/null +++ b/doc/config-ref-rst/source/shared-file-systems/rpc.rst @@ -0,0 +1,18 @@ +================================== +Configure the RPC messaging system +================================== + +OpenStack projects use an open standard for messaging middleware known +as AMQP. This messaging middleware enables the OpenStack services that +run on multiple servers to talk to each other. The OpenStack common +library project, oslo, supports three implementations of AMQP: RabbitMQ, +Qpid, and ZeroMQ. + +The following tables contain settings to configure the messaging +middleware for the Shared File System service: + +.. include:: ../tables/manila-amqp.rst +.. include:: ../tables/manila-rpc.rst +.. include:: ../tables/manila-rabbitmq.rst +.. include:: ../tables/manila-qpid.rst +.. include:: ../tables/manila-zeromq.rst