Improved installation guide diagrams

I improved the example architecture diagrams in the
installation guide. Future patches will address other
diagrams using a similar theme. This patch also includes
some content changes to agree with the new diagrams.

Change-Id: I5ba3d035805200716c1cebc1a0fedb0b959e6966
Implements: blueprint installation-guide-improvements
backport: juno

doc/install-guide/ch_basic_environment.xml

@@ -19,17 +19,18 @@
 
   <para>This chapter explains how to configure each node in the
     <link linkend="architecture_example-architectures">example architectures</link>
-    including the <link linkend="example-architecture-with-legacy-networking">
+    including the <link linkend="example-architecture-with-legacy-networking-hw">
     two-node architecture with legacy networking</link> and
-    <link linkend="example-architecture-with-neutron-networking">three-node
+    <link linkend="example-architecture-with-neutron-networking-hw">three-node
     architecture with OpenStack Networking (neutron)</link>.</para>
   <note>
-    <para>Although most environments include OpenStack Identity, Image Service,
+    <para>Although most environments include Identity, Image Service,
-      Compute, at least one networking service, and the dashboard, OpenStack
+      Compute, at least one networking service, and the dashboard, the
-      Object Storage can operate independently of most other services. If your
+      Object Storage service can operate independently. If your use case
-      use case only involves Object Storage, you can skip to
+      only involves Object Storage, you can skip to
-      <xref linkend="ch_swift"/>. However, the dashboard will not run without
+      <xref linkend="ch_swift"/> after configuring the appropriate nodes
-      at least OpenStack Image Service and Compute.</para>
+      for it. However, the dashboard requires at least
+      the Image Service and Compute.</para>
   </note>
   <note>
     <para>You must use an account with administrative privileges to configure

doc/install-guide/ch_overview.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter [
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
+]>
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -43,118 +47,192 @@
     <title>Example architectures</title>
     <para>OpenStack is highly configurable to meet different needs with various
       compute, networking, and storage options. This guide enables you to
-      choose your own OpenStack adventure using a combination of basic and
+      choose your own OpenStack adventure using a combination of core and
       optional services. This guide uses the following example
       architectures:</para>
     <itemizedlist>
       <listitem>
-        <para>Three-node architecture with OpenStack Networking (neutron). See <xref linkend="example-architecture-with-neutron-networking"/>.</para>
+        <para>Three-node architecture with OpenStack Networking
+          (neutron) and optional nodes for Block Storage and Object
+          Storage services.</para>
         <itemizedlist>
           <listitem>
-            <para>The basic controller node runs the Identity service, Image
+            <para>The
+              <glossterm baseform="cloud controller node"
+              >controller node</glossterm> runs the Identity service, Image
               Service, management portions of Compute and Networking,
               Networking plug-in, and the dashboard. It also includes
-              supporting services such as a database,
+              supporting services such as a SQL database,
-              <glossterm>message broker</glossterm>, and
+              <glossterm>message queue</glossterm>, and
-              <glossterm>Network Time Protocol (NTP)</glossterm>.
+              <glossterm>Network Time Protocol (NTP)</glossterm>.</para>
-            </para>
             <para>Optionally, the controller node also runs portions of
-              Block Storage, Object Storage, Database Service, Orchestration,
+              Block Storage, Object Storage, Orchestration, Telemetry,
-              and Telemetry. These components provide additional features for
+              Database, and Data Processing services. These
-              your environment.</para>
+              components provide additional features for your
+              environment.</para>
           </listitem>
           <listitem>
-            <para>The network node runs the Networking plug-in, layer-2 agent,
+            <para>The network node runs the Networking plug-in and
-              and several layer-3 agents that provision and operate tenant
+              several agents that provision tenant networks and provide
-              networks. Layer-2 services include provisioning of virtual
+              switching, routing,
-              networks and tunnels. Layer-3 services include routing,
+              <glossterm baseform="Network Address Translation (NAT)"
-              <glossterm baseform="Network Address Translation (NAT)">NAT</glossterm>,
+              >NAT</glossterm>, and <glossterm>DHCP</glossterm> services.
-              and <glossterm>DHCP</glossterm>. This node also handles
+              This node also handles external (Internet) connectivity for
-              external (Internet) connectivity for tenant virtual machines
+              tenant virtual machine instances.</para>
-              or instances.</para>
           </listitem>
           <listitem>
-            <para>The compute node runs the hypervisor portion of Compute,
+            <para>The <glossterm>compute node</glossterm> runs the
-              which operates tenant virtual machines or instances. By default
+              <glossterm>hypervisor</glossterm> portion of Compute
-              Compute uses KVM as the hypervisor. The compute node also runs
+              that operates <glossterm>tenant</glossterm>
-              the Networking plug-in and layer-2 agent which operate tenant
+              <glossterm baseform="virtual machine (VM)">virtual machines</glossterm>
-              networks and implement security groups. You can run more than
+              or instances. By default, Compute uses
-              one compute node.</para>
+              <glossterm baseform="kernel-based VM (KVM)">KVM</glossterm>
-            <para>Optionally, the compute node also runs the Telemetry
+              as the <glossterm>hypervisor</glossterm>. The compute node
-              agent. This component provides additional features for
+              also runs the Networking plug-in and an agent that connect
-              your environment.</para>
+              tenant networks to instances and provide firewalling
+              (<glossterm baseform="security group"
+              >security groups</glossterm>) services. You can run more
+              than one compute node.</para>
+            <para>Optionally, the compute node also runs a Telemetry
+              agent to collect metrics.</para>
           </listitem>
           <listitem>
-            <para>The optional storage node contains the disks that the Block
+            <para>The optional Block Storage node contains the disks that
-              Storage service uses to serve volumes. You can run more than one
+              the Block Storage service provisions for tenant virtual machine
-              storage node.</para>
+              instances. You can run more than one of these nodes.</para>
-            <para>Optionally, the storage node also runs the Telemetry
+            <para>Optionally, the Block Storage node also runs a Telemetry
-              agent. This component provides additional features for
+              agent to collect metrics.</para>
-              your environment.</para>
+          </listitem>
+          <listitem>
+            <para>The optional Object Storage nodes contain the disks that
+              the Object Storage service uses for storing accounts,
+              containers, and objects. You can run more than two of these
+              nodes. However, the minimal architecture example requires
+              two nodes.</para>
           </listitem>
         </itemizedlist>
         <note>
           <para>When you implement this architecture, skip
             <xref linkend="section_nova-networking" /> in
-            <xref linkend="ch_networking" />. To use optional services, you
+            <xref linkend="ch_networking" />. Optional services might
-            might need to install additional nodes, as described in
+            require additional nodes or additional resources on existing
-            subsequent chapters.</para>
+            nodes.</para>
         </note>
-        <figure xml:id="example-architecture-with-neutron-networking">
+        <figure xml:id="example-architecture-with-neutron-networking-hw">
-          <title>Three-node architecture with OpenStack Networking (neutron)</title>
+          <title>Minimal architecture example with OpenStack Networking
+            (neutron)&mdash;Hardware requirements</title>
           <mediaobject>
             <imageobject>
               <imagedata contentwidth="6in"
-                fileref="figures/installguide_arch-neutron.png"/>
+                fileref="../common/figures/installguidearch-neutron-hw.png"/>
             </imageobject>
           </mediaobject>
         </figure>
+        <figure xml:id="example-architecture-with-neutron-networking-networks">
+          <title>Minimal architecture example with OpenStack Networking
+            (neutron)&mdash;Network layout</title>
+          <mediaobject>
+            <imageobject>
+              <imagedata contentwidth="6in"
+                fileref="../common/figures/installguidearch-neutron-networks.png"/>
+            </imageobject>
+          </mediaobject>
+        </figure>
+        <figure xml:id="example-architecture-with-neutron-networking-services">
+          <title>Minimal architecture example with OpenStack Networking
+            (neutron)&mdash;Service layout</title>
+          <mediaobject>
+            <imageobject>
+              <imagedata contentwidth="6in"
+                fileref="../common/figures/installguidearch-neutron-services.png"/>
+            </imageobject>
+          </mediaobject>
+        </figure>
+
       </listitem>
       <listitem>
-        <para>Two-node architecture with legacy networking (nova-network). See
+        <para>Two-node architecture with legacy networking
-          <xref linkend="example-architecture-with-legacy-networking"/>.</para>
+          (nova-network) and optional nodes for Block Storage and
+          Object Storage services.</para>
         <itemizedlist>
           <listitem>
-            <para>The basic
+            <para>The
-              <glossterm baseform="cloud controller node">controller node</glossterm>
+              <glossterm baseform="cloud controller node"
-              runs the Identity service, Image Service, management portion of
+              >controller node</glossterm> runs the Identity service,
-              Compute, and the dashboard necessary to launch a simple instance.
+              Image Service, management portion of Compute, and the
-              It also includes supporting services such as a database, message
+              dashboard. It also includes supporting services such as
-              broker, and NTP.</para>
+              a SQL database, <glossterm>message queue</glossterm>, and
+              <glossterm>Network Time Protocol (NTP)</glossterm>.</para>
             <para>Optionally, the controller node also runs portions of
-              Block Storage, Object Storage, Database Service, Orchestration,
+              Block Storage, Object Storage, Orchestration, Telemetry,
-              and Telemetry. These components provide additional features for
+              Database, and Data Processing services. These
-              your environment.</para>
+              components provide additional features for your
+              environment.</para>
           </listitem>
           <listitem>
-            <para>The basic <glossterm>compute node</glossterm> runs the
+            <para>The <glossterm>compute node</glossterm> runs the
-              <glossterm>hypervisor</glossterm> portion of Compute,
+              <glossterm>hypervisor</glossterm> portion of Compute
-              which operates <glossterm>tenant</glossterm>
+              that operates <glossterm>tenant</glossterm>
               <glossterm baseform="virtual machine (VM)">virtual machines</glossterm>
               or instances. By default, Compute uses
               <glossterm baseform="kernel-based VM (KVM)">KVM</glossterm>
               as the <glossterm>hypervisor</glossterm>. Compute also
-              provisions and operates tenant networks and implements
+              provisions tenant networks and provides firewalling
-              <glossterm baseform="security group">security groups</glossterm>.
+              (<glossterm baseform="security group"
-              You can run more than one compute node.</para>
+              >security groups</glossterm>) services. You can run more
-            <para>Optionally, the compute node also runs the Telemetry
+              than one compute node.</para>
-              agent. This component provides additional features for
+            <para>Optionally, the compute node also runs a Telemetry
-              your environment.</para>
+              agent to collect metrics.</para>
+          </listitem>
+          <listitem>
+            <para>The optional Block Storage node contains the disks that
+              the Block Storage service provisions for tenant virtual machine
+              instances. You can run more than one of these nodes.</para>
+            <para>Optionally, the Block Storage node also runs a Telemetry
+              agent to collect metrics.</para>
+          </listitem>
+          <listitem>
+            <para>The optional Object Storage nodes contain the disks that
+              the Object Storage service uses for storing accounts,
+              containers, and objects. You can run more than two of these
+              nodes. However, the minimal architecture example requires
+              two nodes.</para>
           </listitem>
         </itemizedlist>
         <note>
           <para>When you implement this architecture, skip
             <xref linkend="section_neutron-networking" /> in
             <xref linkend="ch_networking" />. To use optional services, you
-            might need to install additional nodes, as described in
+            might need to build additional nodes, as described in
             subsequent chapters.</para>
         </note>
-        <figure xml:id="example-architecture-with-legacy-networking">
+        <figure xml:id="example-architecture-with-legacy-networking-hw">
-          <title>Two-node architecture with legacy networking (nova-network)</title>
+          <title>Minimal architecture example with legacy networking
+            (nova-network)&mdash;Hardware requirements</title>
           <mediaobject>
             <imageobject>
               <imagedata contentwidth="6in"
-                fileref="figures/installguide_arch-nova.png"/>
+                fileref="../common/figures/installguidearch-nova-hw.png"/>
+            </imageobject>
+          </mediaobject>
+        </figure>
+        <figure xml:id="example-architecture-with-legacy-networking-networks">
+          <title>Minimal architecture example with legacy networking
+            (nova-network)&mdash;Network layout</title>
+          <mediaobject>
+            <imageobject>
+              <imagedata contentwidth="6in"
+                fileref="../common/figures/installguidearch-nova-networks.png"/>
+            </imageobject>
+          </mediaobject>
+        </figure>
+        <figure xml:id="example-architecture-with-legacy-networking-services">
+          <title>Minimal architecture example with legacy networking
+            (nova-network)&mdash;Service layout</title>
+          <mediaobject>
+            <imageobject>
+              <imagedata contentwidth="6in"
+                fileref="../common/figures/installguidearch-nova-services.png"/>
             </imageobject>
           </mediaobject>
         </figure>

doc/install-guide/section_basics-networking-neutron.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section [
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
+]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -24,11 +28,12 @@
       interface with the highest number.</para>
   </note>
   <figure>
-    <title>Three-node architecture with OpenStack Networking (neutron)</title>
+    <title>Minimal architecture example with OpenStack Networking
+      (neutron)&mdash;Network layout</title>
     <mediaobject>
       <imageobject>
         <imagedata contentwidth="6in"
-          fileref="figures/installguide_arch-neutron.png"/>
+          fileref="../common/figures/installguidearch-neutron-networks.png"/>
       </imageobject>
     </mediaobject>
   </figure>

doc/install-guide/section_basics-networking-nova.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section [
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
+]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -20,11 +24,12 @@
       interface with the highest number.</para>
   </note>
   <figure>
-    <title>Two-node architecture with legacy networking (nova-network)</title>
+    <title>Minimal architecture example with legacy networking
+      (nova-network)&mdash;Network layout</title>
     <mediaobject>
       <imageobject>
         <imagedata contentwidth="6in"
-          fileref="figures/installguide_arch-nova.png"/>
+          fileref="../common/figures/installguidearch-nova-networks.png"/>
         </imageobject>
     </mediaobject>
   </figure>

doc/install-guide/section_basics-prerequisites.xml

@@ -6,10 +6,14 @@
   xml:id="basics-prerequisites">
   <?dbhtml stop-chunking?>
   <title>Before you begin</title>
-  <para>For a functional environment, OpenStack doesn't require a
+  <para>For best performance, we recommend that your environment meets or
-    significant amount of resources. We recommend that your environment meets
+    exceeds the hardware requirements in
-    or exceeds the following minimum requirements which can support several
+    <xref linkend="example-architecture-with-neutron-networking-hw"/> or
-    minimal <glossterm>CirrOS</glossterm> instances:</para>
+    <xref linkend="example-architecture-with-legacy-networking-hw"/>. However,
+    OpenStack does not require a significant amount of resources and the
+    following minimum requirements should support a proof-of-concept
+    environment with core services and several
+    <glossterm>CirrOS</glossterm> instances:</para>
   <itemizedlist>
     <listitem>
       <para>Controller Node: 1 processor, 2 GB memory, and 5 GB
@@ -56,7 +60,8 @@
     acceleration of nested VMs.</para>
   <note>
     <para>If you choose to install on VMs, make sure your hypervisor
-      permits <glossterm>promiscuous mode</glossterm> on the
+      permits <glossterm>promiscuous mode</glossterm> and disables MAC
+      address filtering on the
       <glossterm>external network</glossterm>.</para>
   </note>
   <para>For more information about system requirements, see the <link