From fb2fb7a55e2a1149e7250dbaded79084c526960c Mon Sep 17 00:00:00 2001 From: chenxing Date: Tue, 1 Nov 2016 03:03:12 +0000 Subject: [PATCH] Make rabbitmq configuration much 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: I412a7e43197aca8ff78a139c5f9ee91590421e59 --- .../configure_services/glance/install-glance-obs.rst | 12 +++--------- .../configure_services/glance/install-glance-rdo.rst | 12 +++--------- .../glance/install-glance-ubuntu.rst | 12 +++--------- .../configure_services/nova/install-nova-common.rst | 12 +++--------- install-guide/source/install-base-config-common.rst | 10 ++-------- 5 files changed, 14 insertions(+), 44 deletions(-) diff --git a/install-guide/source/configure_services/glance/install-glance-obs.rst b/install-guide/source/configure_services/glance/install-glance-obs.rst index 10abd2f9bc..2aa0a291fe 100644 --- a/install-guide/source/configure_services/glance/install-glance-obs.rst +++ b/install-guide/source/configure_services/glance/install-glance-obs.rst @@ -11,26 +11,20 @@ Configure the Image service to use Telemetry ``/etc/glance/glance-registry.conf`` files and complete the following actions: - * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]``, and - ``[oslo_messaging_rabbit]`` sections, configure notifications and RabbitMQ + * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]`` sections, + configure notifications and RabbitMQ message broker access: .. code-block:: ini [DEFAULT] ... - rpc_backend = rabbit + transport_url = rabbit://openstack:RABBIT_PASS@controller [oslo_messaging_notifications] ... driver = messagingv2 - [oslo_messaging_rabbit] - ... - rabbit_host = controller - rabbit_userid = openstack - rabbit_password = RABBIT_PASS - Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``. diff --git a/install-guide/source/configure_services/glance/install-glance-rdo.rst b/install-guide/source/configure_services/glance/install-glance-rdo.rst index d4601f0676..58a4ba17f6 100644 --- a/install-guide/source/configure_services/glance/install-glance-rdo.rst +++ b/install-guide/source/configure_services/glance/install-glance-rdo.rst @@ -11,26 +11,20 @@ Configure the Image service to use Telemetry ``/etc/glance/glance-registry.conf`` files and complete the following actions: - * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]``, and - ``[oslo_messaging_rabbit]`` sections, configure notifications and RabbitMQ + * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]`` sections, + configure notifications and RabbitMQ message broker access: .. code-block:: ini [DEFAULT] ... - rpc_backend = rabbit + transport_url = rabbit://openstack:RABBIT_PASS@controller [oslo_messaging_notifications] ... driver = messagingv2 - [oslo_messaging_rabbit] - ... - rabbit_host = controller - rabbit_userid = openstack - rabbit_password = RABBIT_PASS - Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``. diff --git a/install-guide/source/configure_services/glance/install-glance-ubuntu.rst b/install-guide/source/configure_services/glance/install-glance-ubuntu.rst index 55f590e74a..b46fe5ecfa 100644 --- a/install-guide/source/configure_services/glance/install-glance-ubuntu.rst +++ b/install-guide/source/configure_services/glance/install-glance-ubuntu.rst @@ -11,26 +11,20 @@ Configure the Image service to use Telemetry ``/etc/glance/glance-registry.conf`` files and complete the following actions: - * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]``, and - ``[oslo_messaging_rabbit]`` sections, configure notifications and RabbitMQ + * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]`` sections, + configure notifications and RabbitMQ message broker access: .. code-block:: ini [DEFAULT] ... - rpc_backend = rabbit + transport_url = rabbit://openstack:RABBIT_PASS@controller [oslo_messaging_notifications] ... driver = messagingv2 - [oslo_messaging_rabbit] - ... - rabbit_host = controller - rabbit_userid = openstack - rabbit_password = RABBIT_PASS - Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``. diff --git a/install-guide/source/configure_services/nova/install-nova-common.rst b/install-guide/source/configure_services/nova/install-nova-common.rst index 27c29ec987..b14d232cf1 100644 --- a/install-guide/source/configure_services/nova/install-nova-common.rst +++ b/install-guide/source/configure_services/nova/install-nova-common.rst @@ -1,20 +1,14 @@ 2. Edit the ``/etc/ceilometer/ceilometer.conf`` file and complete the following actions: - * 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/install-base-config-common.rst b/install-guide/source/install-base-config-common.rst index 17d121077c..b208478c0e 100644 --- a/install-guide/source/install-base-config-common.rst +++ b/install-guide/source/install-base-config-common.rst @@ -14,20 +14,14 @@ as ':', '/', '+', and '@' in the connection string in accordance with `RFC2396 `_. - * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, + * 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``.