From 7132ea70141c0578da013d09371f550458513828 Mon Sep 17 00:00:00 2001 From: Vadim Hmyrov Date: Tue, 8 Nov 2016 13:59:18 +0200 Subject: [PATCH] Update guide section for messaging setup Our current guide suggests to use already deprecated messaging options. Change-Id: I8c5e58979d05bae0cdaa3499e2c404799232f2ab Closes-Bug: #1639738 --- .../source/include/configure-ironic-api.rst | 22 ++++------------- .../include/configure-ironic-conductor.rst | 24 +++++-------------- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/install-guide/source/include/configure-ironic-api.rst b/install-guide/source/include/configure-ironic-api.rst index 2b949c5907..4b8ce79880 100644 --- a/install-guide/source/include/configure-ironic-api.rst +++ b/install-guide/source/include/configure-ironic-api.rst @@ -18,28 +18,16 @@ Configuring ironic-api service connection=mysql+pymysql://ironic:IRONIC_DBPASSWORD@DB_IP/ironic?charset=utf8 #. Configure the ironic-api service to use the RabbitMQ message broker by - setting one or more of these options. Replace ``RABBIT_HOST`` with the - address of the RabbitMQ server: + setting the following option. Replace ``RPC_*`` with appropriate + address details and credentials of RabbitMQ server: .. code-block:: ini [DEFAULT] - # The messaging driver to use, defaults to rabbit. Other - # drivers include qpid and zmq. (string value) - #rpc_backend=rabbit - - [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 + # A URL representing the messaging driver to use and its full + # configuration. (string value) + transport_url = rabbit://RPC_USER:RPC_PASSWORD@RPC_HOST:RPC_PORT/ #. Configure the ironic-api service to use these credentials with the Identity service. Replace ``PUBLIC_IDENTITY_IP`` with the public IP of the Identity diff --git a/install-guide/source/include/configure-ironic-conductor.rst b/install-guide/source/include/configure-ironic-conductor.rst index 7b8fefda5e..e17f8f1faa 100644 --- a/install-guide/source/include/configure-ironic-conductor.rst +++ b/install-guide/source/include/configure-ironic-conductor.rst @@ -54,29 +54,17 @@ Configuring ironic-conductor service connection=mysql+pymysql://ironic:IRONIC_DBPASSWORD@DB_IP/ironic?charset=utf8 #. 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 - configuration as ironic-api. Replace ``RABBIT_HOST`` with the address of the - RabbitMQ server: + setting the following option. Ironic-conductor should use the same + configuration as ironic-api. Replace ``RPC_*`` with appropriate + address details and credentials of RabbitMQ server: .. code-block:: ini [DEFAULT] - # The messaging driver to use, defaults to rabbit. Other - # drivers include qpid and zmq. (string value) - #rpc_backend=rabbit - - [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 + # A URL representing the messaging driver to use and its full + # configuration. (string value) + transport_url = rabbit://RPC_USER:RPC_PASSWORD@RPC_HOST:RPC_PORT/ #. Configure the ironic-conductor service so that it can communicate with the Image service. Replace ``GLANCE_IP`` with the hostname or IP address of