Merge "Update guide section for messaging setup"

This commit is contained in:
Jenkins 2016-11-09 02:26:31 +00:00 committed by Gerrit Code Review
commit b93449856c
2 changed files with 11 additions and 35 deletions

View File

@ -18,28 +18,16 @@ Configuring ironic-api service
connection=mysql+pymysql://ironic:IRONIC_DBPASSWORD@DB_IP/ironic?charset=utf8 connection=mysql+pymysql://ironic:IRONIC_DBPASSWORD@DB_IP/ironic?charset=utf8
#. Configure the ironic-api service to use the RabbitMQ message broker by #. Configure the ironic-api service to use the RabbitMQ message broker by
setting one or more of these options. Replace ``RABBIT_HOST`` with the setting the following option. Replace ``RPC_*`` with appropriate
address of the RabbitMQ server: address details and credentials of RabbitMQ server:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
# The messaging driver to use, defaults to rabbit. Other # A URL representing the messaging driver to use and its full
# drivers include qpid and zmq. (string value) # configuration. (string value)
#rpc_backend=rabbit transport_url = rabbit://RPC_USER:RPC_PASSWORD@RPC_HOST:RPC_PORT/
[oslo_messaging_rabbit]
# The RabbitMQ broker address where a single node is used
# (string value)
rabbit_host=RABBIT_HOST
# The RabbitMQ userid (string value)
#rabbit_userid=guest
# The RabbitMQ password (string value)
#rabbit_password=guest
#. Configure the ironic-api service to use these credentials with the Identity #. Configure the ironic-api service to use these credentials with the Identity
service. Replace ``PUBLIC_IDENTITY_IP`` with the public IP of the Identity service. Replace ``PUBLIC_IDENTITY_IP`` with the public IP of the Identity

View File

@ -54,29 +54,17 @@ Configuring ironic-conductor service
connection=mysql+pymysql://ironic:IRONIC_DBPASSWORD@DB_IP/ironic?charset=utf8 connection=mysql+pymysql://ironic:IRONIC_DBPASSWORD@DB_IP/ironic?charset=utf8
#. Configure the ironic-conductor service to use the RabbitMQ message broker by #. Configure the ironic-conductor service to use the RabbitMQ message broker by
setting one or more of these options. Ironic-conductor should use the same setting the following option. Ironic-conductor should use the same
configuration as ironic-api. Replace ``RABBIT_HOST`` with the address of the configuration as ironic-api. Replace ``RPC_*`` with appropriate
RabbitMQ server: address details and credentials of RabbitMQ server:
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
# The messaging driver to use, defaults to rabbit. Other # A URL representing the messaging driver to use and its full
# drivers include qpid and zmq. (string value) # configuration. (string value)
#rpc_backend=rabbit transport_url = rabbit://RPC_USER:RPC_PASSWORD@RPC_HOST:RPC_PORT/
[oslo_messaging_rabbit]
# The RabbitMQ broker address where a single node is used.
# (string value)
rabbit_host=RABBIT_HOST
# The RabbitMQ userid. (string value)
#rabbit_userid=guest
# The RabbitMQ password. (string value)
#rabbit_password=guest
#. Configure the ironic-conductor service so that it can communicate with the #. Configure the ironic-conductor service so that it can communicate with the
Image service. Replace ``GLANCE_IP`` with the hostname or IP address of Image service. Replace ``GLANCE_IP`` with the hostname or IP address of