openstack/ceilometer
Code Issues Proposed changes

Merge "Make rabbitmq configuration much simpler"

Browse Source
This commit is contained in:
Jenkins 2017-01-04 08:45:55 +00:00 committed by Gerrit Code Review
commit e1c30f976a
5 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install-guide/source/configure_services/glance/install-glance-obs.rst
View File

@ -11,26 +11,20 @@ Configure the Image service to use Telemetry
``/etc/glance/glance-registry.conf`` files and ``/etc/glance/glance-registry.conf`` files and
complete the following actions: complete the following actions:
* In the ``[DEFAULT]``, ``[oslo_messaging_notifications]``, and * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]`` sections,
``[oslo_messaging_rabbit]`` sections, configure notifications and RabbitMQ configure notifications and RabbitMQ
message broker access: message broker access:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
... ...
rpc_backend = rabbit transport_url = rabbit://openstack:RABBIT_PASS@controller
[oslo_messaging_notifications] [oslo_messaging_notifications]
... ...
driver = messagingv2 driver = messagingv2
[oslo_messaging_rabbit]
...
rabbit_host = controller
rabbit_userid = openstack
rabbit_password = RABBIT_PASS
Replace ``RABBIT_PASS`` with the password you chose for Replace ``RABBIT_PASS`` with the password you chose for
the ``openstack`` account in ``RabbitMQ``. the ``openstack`` account in ``RabbitMQ``.

12
install-guide/source/configure_services/glance/install-glance-rdo.rst
View File

@ -11,26 +11,20 @@ Configure the Image service to use Telemetry
``/etc/glance/glance-registry.conf`` files and ``/etc/glance/glance-registry.conf`` files and
complete the following actions: complete the following actions:
* In the ``[DEFAULT]``, ``[oslo_messaging_notifications]``, and * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]`` sections,
``[oslo_messaging_rabbit]`` sections, configure notifications and RabbitMQ configure notifications and RabbitMQ
message broker access: message broker access:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
... ...
rpc_backend = rabbit transport_url = rabbit://openstack:RABBIT_PASS@controller
[oslo_messaging_notifications] [oslo_messaging_notifications]
... ...
driver = messagingv2 driver = messagingv2
[oslo_messaging_rabbit]
...
rabbit_host = controller
rabbit_userid = openstack
rabbit_password = RABBIT_PASS
Replace ``RABBIT_PASS`` with the password you chose for Replace ``RABBIT_PASS`` with the password you chose for
the ``openstack`` account in ``RabbitMQ``. the ``openstack`` account in ``RabbitMQ``.

12
install-guide/source/configure_services/glance/install-glance-ubuntu.rst
View File

@ -11,26 +11,20 @@ Configure the Image service to use Telemetry
``/etc/glance/glance-registry.conf`` files and ``/etc/glance/glance-registry.conf`` files and
complete the following actions: complete the following actions:
* In the ``[DEFAULT]``, ``[oslo_messaging_notifications]``, and * In the ``[DEFAULT]``, ``[oslo_messaging_notifications]`` sections,
``[oslo_messaging_rabbit]`` sections, configure notifications and RabbitMQ configure notifications and RabbitMQ
message broker access: message broker access:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
... ...
rpc_backend = rabbit transport_url = rabbit://openstack:RABBIT_PASS@controller
[oslo_messaging_notifications] [oslo_messaging_notifications]
... ...
driver = messagingv2 driver = messagingv2
[oslo_messaging_rabbit]
...
rabbit_host = controller
rabbit_userid = openstack
rabbit_password = RABBIT_PASS
Replace ``RABBIT_PASS`` with the password you chose for Replace ``RABBIT_PASS`` with the password you chose for
the ``openstack`` account in ``RabbitMQ``. the ``openstack`` account in ``RabbitMQ``.

12
install-guide/source/configure_services/nova/install-nova-common.rst
View File

@ -1,20 +1,14 @@
2. Edit the ``/etc/ceilometer/ceilometer.conf`` file and 2. Edit the ``/etc/ceilometer/ceilometer.conf`` file and
complete the following actions: complete the following actions:
* 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``.

10
install-guide/source/install-base-config-common.rst
View File

@ -14,20 +14,14 @@
as ':', '/', '+', and '@' in the connection string in accordance as ':', '/', '+', and '@' in the connection string in accordance
with `RFC2396 <https://www.ietf.org/rfc/rfc2396.txt>`_. with `RFC2396 <https://www.ietf.org/rfc/rfc2396.txt>`_.
* In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, * In the ``[DEFAULT]`` section,
configure ``RabbitMQ`` message queue access: configure ``RabbitMQ`` 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``.