openstack/openstack-manuals
Code Issues Proposed changes

Merge "Update OpenStack Orchestration to Orchestration module"

Browse Source
This commit is contained in:
Jenkins 2014-02-07 08:33:08 +00:00 committed by Gerrit Code Review
commit 5a34070a66
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/common/app_support.xml
View File

@ -281,7 +281,7 @@ and so on.</para>
</listitem>
<listitem>
<para><link xlink:href="https://bugs.launchpad.net/heat">Bugs:
OpenStack Orchestration (heat)</link></para>
Orchestration (heat)</link></para>
</listitem>
<listitem>
<para><link xlink:href="https://bugs.launchpad.net/ceilometer"

2
doc/common/ch_cli_heat_commands.xml
View File

@ -10,7 +10,7 @@
<title>heat commands</title>
<para>The heat client is the command-line interface (CLI) for the
OpenStack Orchestration API and its extensions.</para>
Orchestration API and its extensions.</para>
<para>For help on a specific <command>heat</command>
command, enter:
</para>

2
doc/config-reference/compute/section_hypervisor_baremetal.xml
View File

@ -12,7 +12,7 @@ xml:id="baremetal">
hardware through the OpenStack APIs, using pluggable sub-drivers to deliver
machine imaging (PXE) and power control (IPMI). With this, provisioning
and management of physical hardware is accomplished by using common cloud
APIs and tools, such as OpenStack Orchestration or salt-cloud.
APIs and tools, such as the Orchestration module (heat) or salt-cloud.
However, due to this unique
situation, using the baremetal driver requires some additional
preparation of its environment, the details of which are beyond the

13
doc/glossary/glossary-terms.xml
View File

@ -1171,13 +1171,12 @@ daemon that provides
<glossentry>
<glossterm>core project</glossterm>
<glossdef>
<para>An official OpenStack project. Currently
consists of Compute (nova), Object Storage
(swift), Image Service (glance), Identity
(keystone), Dashboard (horizon), Networking
(neutron), Block Storage (cinder), Telemetry
Service (ceilometer) and Orchestration Service
(heat).</para>
<para>An official OpenStack project. Currently consists of Compute (nova), Object
Storage (swift), Image Service (glance), Identity (keystone), Dashboard
(horizon), Networking (neutron), and Block Storage (cinder). The Telemetry
module (ceilometer) and Orchestration module (heat) are integrated projects as
of the Havana release. In the Icehouse release, the Database module (trove)
gains integrated project status.</para>
</glossdef>
</glossentry>
<glossentry>

2
doc/install-guide/ch_heat.xml
View File

@ -4,7 +4,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xml:id="ch_heat">
<title>Add the Orchestration service</title>
<para>Use the OpenStack Orchestration service to create cloud
<para>Use the Orchestration module to create cloud
resources using a template language called HOT. The
integrated project name is Heat.</para>
<xi:include href="../common/section_getstart_orchestration.xml"/>

4
doc/install-guide/section_heat-install.xml
View File

@ -5,7 +5,7 @@
<title>Install the Orchestration service</title>
<procedure os="debian">
<step>
<para>Install the OpenStack Orchestration service on the controller
<para>Install the Orchestration module on the controller
node:</para>
<screen os="debian"><prompt>#</prompt> <userinput>apt-get install heat-api heat-api-cfn heat-engine</userinput></screen>
</step>
@ -21,7 +21,7 @@
</procedure>
<procedure>
<step>
<para>Install the OpenStack Orchestration service on the controller
<para>Install the Orchestration module on the controller
node:</para>
<screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install heat-api heat-api-cfn heat-engine</userinput></screen>
<screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-heat-api openstack-heat-engine \