openstack
/
manila
Code Issues Proposed changes

Merge "[install] Make the rabbitmq configuration simpler" into stable/newton

This commit is contained in:
Jenkins 2017-02-01 19:26:49 +00:00 committed by Gerrit Code Review
parent 24240e412f c84b3035e9
commit 9e195201d4
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install-guide/source/common/controller-node-common-configuration.rst
View File

@ -1,19 +1,13 @@
3. Complete the rest of the configuration in ``manila.conf``: 3. Complete the rest of the configuration in ``manila.conf``:
* In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, configure * In the ``[DEFAULT]`` section, configure ``RabbitMQ``
``RabbitMQ`` message queue access: message queue access:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
... ...
rpc_backend = rabbit transport_url = rabbit://openstack:RABBIT_PASS@controller
[oslo_messaging_rabbit]
...
rabbit_host = controller
rabbit_userid = openstack
rabbit_password = RABBIT_PASS
Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` Replace ``RABBIT_PASS`` with the password you chose for the ``openstack``
account in ``RabbitMQ``. account in ``RabbitMQ``.

12
install-guide/source/common/share-node-common-configuration.rst
View File

@ -1,19 +1,13 @@
4. Complete the rest of the configuration in ``manila.conf``. 4. Complete the rest of the configuration in ``manila.conf``.
* In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, * In the ``[DEFAULT]`` section, configure ``RabbitMQ``
configure ``RabbitMQ`` message queue access: message queue access:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
... ...
rpc_backend = rabbit transport_url = rabbit://openstack:RABBIT_PASS@controller
[oslo_messaging_rabbit]
...
rabbit_host = controller
rabbit_userid = openstack
rabbit_password = RABBIT_PASS
Replace ``RABBIT_PASS`` with the password you chose for the Replace ``RABBIT_PASS`` with the password you chose for the
``openstack`` account in ``RabbitMQ``. ``openstack`` account in ``RabbitMQ``.