From 310c73ba9cd18c4fc0a9915bc7bb73d8eb0a08cc Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Wed, 28 Oct 2015 14:40:38 +0900 Subject: [PATCH] [install] Change modules to services At now, Orchestration and Telemetry are services, not modules. https://git.openstack.org/cgit/openstack/governance/tree/reference/projects.yaml Change-Id: I34fb2af2dad200a517259053d4cf291c1559d53d --- .../source/ceilometer-controller-install.rst | 12 ++++++------ doc/install-guide/source/ceilometer-nova.rst | 4 ++-- doc/install-guide/source/ceilometer-verify.rst | 2 +- doc/install-guide/source/ceilometer.rst | 6 +++--- doc/install-guide/source/heat-install.rst | 2 +- doc/install-guide/source/heat-verify.rst | 2 +- doc/install-guide/source/heat.rst | 8 ++++---- doc/install-guide/source/launch-instance-heat.rst | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/install-guide/source/ceilometer-controller-install.rst b/doc/install-guide/source/ceilometer-controller-install.rst index c5190b5916..be4d543ca5 100644 --- a/doc/install-guide/source/ceilometer-controller-install.rst +++ b/doc/install-guide/source/ceilometer-controller-install.rst @@ -3,8 +3,8 @@ Install and configure controller node ===================================== This section describes how to install and configure the Telemetry -module, code-named ceilometer, on the controller node. The Telemetry -module uses separate agents to collect measurements from each OpenStack +service, code-named ceilometer, on the controller node. The Telemetry +service uses separate agents to collect measurements from each OpenStack service in your environment. To configure prerequisites @@ -114,7 +114,7 @@ MongoDB before proceeding further. | type | metering | +-------------+----------------------------------+ -6. Create the Telemetry module API endpoint: +6. Create the Telemetry service API endpoint: .. code-block:: console @@ -166,8 +166,8 @@ MongoDB before proceeding further. | url | http://controller:8777 | +--------------+----------------------------------+ -To install and configure the Telemetry module components -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +To install and configure the Telemetry service components +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. only:: obs @@ -222,7 +222,7 @@ To install and configure the Telemetry module components connection = mongodb://ceilometer:CEILOMETER_DBPASS@controller:27017/ceilometer Replace ``CEILOMETER_DBPASS`` with the password you chose for the - Telemetry module database. You must escape special characters such + Telemetry service database. You must escape special characters such as ':', '/', '+', and '@' in the connection string in accordance with RFC2396. diff --git a/doc/install-guide/source/ceilometer-nova.rst b/doc/install-guide/source/ceilometer-nova.rst index de99490fba..1a990897d8 100644 --- a/doc/install-guide/source/ceilometer-nova.rst +++ b/doc/install-guide/source/ceilometer-nova.rst @@ -44,7 +44,7 @@ To install and configure the agent telemetry_secret = TELEMETRY_SECRET Replace ``TELEMETRY_SECRET`` with the telemetry secret you - chose for the Telemetry module. + chose for the Telemetry service. * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, configure ``RabbitMQ`` message queue access: @@ -78,7 +78,7 @@ To install and configure the agent admin_password = CEILOMETER_PASS Replace ``CEILOMETER_PASS`` with the password you chose for the - Telemetry module database. + Telemetry service database. .. note:: diff --git a/doc/install-guide/source/ceilometer-verify.rst b/doc/install-guide/source/ceilometer-verify.rst index 49175a3e5c..4975d0929b 100644 --- a/doc/install-guide/source/ceilometer-verify.rst +++ b/doc/install-guide/source/ceilometer-verify.rst @@ -2,7 +2,7 @@ Verify the Telemetry installation ================================= -This section describes how to verify operation of the Telemetry module. +This section describes how to verify operation of the Telemetry service. .. note:: diff --git a/doc/install-guide/source/ceilometer.rst b/doc/install-guide/source/ceilometer.rst index 80ce96151b..19355d00df 100644 --- a/doc/install-guide/source/ceilometer.rst +++ b/doc/install-guide/source/ceilometer.rst @@ -1,8 +1,8 @@ .. _install_ceilometer: -======================== -Add the Telemetry module -======================== +========================= +Add the Telemetry service +========================= .. toctree:: diff --git a/doc/install-guide/source/heat-install.rst b/doc/install-guide/source/heat-install.rst index bce1b37a06..35333883c3 100644 --- a/doc/install-guide/source/heat-install.rst +++ b/doc/install-guide/source/heat-install.rst @@ -4,7 +4,7 @@ Install and configure ~~~~~~~~~~~~~~~~~~~~~ This section describes how to install and configure the -Orchestration module, code-named heat, on the controller node. +Orchestration service, code-named heat, on the controller node. .. only:: obs or rdo or ubuntu diff --git a/doc/install-guide/source/heat-verify.rst b/doc/install-guide/source/heat-verify.rst index 1fd5421d60..c9c430f993 100644 --- a/doc/install-guide/source/heat-verify.rst +++ b/doc/install-guide/source/heat-verify.rst @@ -3,7 +3,7 @@ Verify operation ~~~~~~~~~~~~~~~~ -Verify operation of the Orchestration module. +Verify operation of the Orchestration service. #. Source the ``admin`` tenant credentials: diff --git a/doc/install-guide/source/heat.rst b/doc/install-guide/source/heat.rst index 4d73bd9d70..840aa7875b 100644 --- a/doc/install-guide/source/heat.rst +++ b/doc/install-guide/source/heat.rst @@ -1,6 +1,6 @@ -============================ -Add the Orchestration module -============================ +============================= +Add the Orchestration service +============================= .. toctree:: @@ -9,5 +9,5 @@ Add the Orchestration module heat-verify.rst heat-next-steps.rst -The Orchestration module (heat) uses a heat orchestration +The Orchestration service (heat) uses a heat orchestration template (HOT) to create and manage cloud resources. diff --git a/doc/install-guide/source/launch-instance-heat.rst b/doc/install-guide/source/launch-instance-heat.rst index c173787601..d675c5fa1d 100644 --- a/doc/install-guide/source/launch-instance-heat.rst +++ b/doc/install-guide/source/launch-instance-heat.rst @@ -6,7 +6,7 @@ Orchestration Create a template ----------------- -The Orchestration module uses templates to describe stacks. +The Orchestration service uses templates to describe stacks. To learn about the template language, see `the Template Guide `__ in the `Heat developer documentation