From c84b3035e9d5644a282fc9e4014890e7f05d0688 Mon Sep 17 00:00:00 2001 From: chenxing Date: Tue, 1 Nov 2016 03:31:44 +0000 Subject: [PATCH] [install] Make the rabbitmq configuration simpler Update from this commit https://review.openstack.org/#/c/389971/1 in the openstack-manuals project. Change-Id: I862d3b4e310136c7b9bc151fdfa82b07e8c04978 (cherry picked from commit e01af35b883a3d326aca9e54a2402305f27c7e52) --- .../common/controller-node-common-configuration.rst | 12 +++--------- .../common/share-node-common-configuration.rst | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/install-guide/source/common/controller-node-common-configuration.rst b/install-guide/source/common/controller-node-common-configuration.rst index a7220987e8..9871360c9b 100644 --- a/install-guide/source/common/controller-node-common-configuration.rst +++ b/install-guide/source/common/controller-node-common-configuration.rst @@ -1,19 +1,13 @@ 3. Complete the rest of the configuration in ``manila.conf``: - * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, configure - ``RabbitMQ`` message queue access: + * In the ``[DEFAULT]`` section, configure ``RabbitMQ`` + message queue access: .. code-block:: ini [DEFAULT] ... - rpc_backend = rabbit - - [oslo_messaging_rabbit] - ... - rabbit_host = controller - rabbit_userid = openstack - rabbit_password = RABBIT_PASS + transport_url = rabbit://openstack:RABBIT_PASS@controller Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``. diff --git a/install-guide/source/common/share-node-common-configuration.rst b/install-guide/source/common/share-node-common-configuration.rst index f701e35d52..61c29430b7 100644 --- a/install-guide/source/common/share-node-common-configuration.rst +++ b/install-guide/source/common/share-node-common-configuration.rst @@ -1,19 +1,13 @@ 4. Complete the rest of the configuration in ``manila.conf``. - * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, - configure ``RabbitMQ`` message queue access: + * In the ``[DEFAULT]`` section, configure ``RabbitMQ`` + message queue access: .. code-block:: ini [DEFAULT] ... - rpc_backend = rabbit - - [oslo_messaging_rabbit] - ... - rabbit_host = controller - rabbit_userid = openstack - rabbit_password = RABBIT_PASS + transport_url = rabbit://openstack:RABBIT_PASS@controller Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``.