Update OpenStack Orchestration to Orchestration module

Change-Id: Iabcb6dc3e6d3869dd6c8eed8da1af588e75ce5f8
backport: havana
Closes-bug: 1277105

doc/common/app_support.xml

@@ -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"

doc/common/ch_cli_heat_commands.xml

@@ -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>

doc/config-reference/compute/section_hypervisor_baremetal.xml

@@ -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

doc/glossary/glossary-terms.xml

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

doc/install-guide/ch_heat.xml

@@ -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"/>

doc/install-guide/section_heat-install.xml

@@ -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 \