From bd3199c078551d7aa9adaa18da7cc2158fdf584e Mon Sep 17 00:00:00 2001 From: chenxing Date: Tue, 1 Nov 2016 03:06:33 +0000 Subject: [PATCH] make the rabbitmq configuration simpler Update from this commit https://review.openstack.org/#/c/389971/1 in the openstack-manuals project. 'rpc_backend', 'rabbit_host', 'rabbit_userid', and 'rabbit_password' are deprecated for removal, for more information, see http://docs.openstack.org/developer/oslo.messaging/opts.html#configuration-options Change-Id: I0996285f3c092c630fc7a2ba52151bc998e3502a --- install-guide/source/install-obs.rst | 10 ++-------- install-guide/source/install-rdo.rst | 10 ++-------- install-guide/source/install-ubuntu.rst | 10 ++-------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/install-guide/source/install-obs.rst b/install-guide/source/install-obs.rst index 89457f1b61..6f49984b1b 100644 --- a/install-guide/source/install-obs.rst +++ b/install-guide/source/install-obs.rst @@ -336,20 +336,14 @@ Install and configure components Replace ``HEAT_DBPASS`` with the password you chose for the Orchestration database. - * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, + * In the ``[DEFAULT]`` section, configure ``RabbitMQ`` message queue access: .. code-block:: none [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/install-rdo.rst b/install-guide/source/install-rdo.rst index 3a6c05972f..a315f2e848 100644 --- a/install-guide/source/install-rdo.rst +++ b/install-guide/source/install-rdo.rst @@ -336,20 +336,14 @@ Install and configure components Replace ``HEAT_DBPASS`` with the password you chose for the Orchestration database. - * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, + * In the ``[DEFAULT]`` section, configure ``RabbitMQ`` message queue access: .. code-block:: none [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/install-ubuntu.rst b/install-guide/source/install-ubuntu.rst index 940a3fa24c..1debfdcaeb 100644 --- a/install-guide/source/install-ubuntu.rst +++ b/install-guide/source/install-ubuntu.rst @@ -335,20 +335,14 @@ Install and configure components Replace ``HEAT_DBPASS`` with the password you chose for the Orchestration database. - * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, + * In the ``[DEFAULT]`` section, configure ``RabbitMQ`` message queue access: .. code-block:: none [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``.