Updates images to landscape where needed; adjust contentwidth

Change-Id: I82087d21c6d126870e7b678ced2f5bcefae9a2fb

doc/arch-design/compute_focus/section_tech_considerations_compute_focus.xml

@@ -225,23 +225,23 @@
         vCPUs, half the vRAM, and half the ephemeral disk space. The
         next largest flavor is half that size again. As a result,
         packing a server for general purpose computing might look
-        conceptually something like this figure:</para>
+        conceptually something like this figure:
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="4in"
                 fileref="../images/Compute_Tech_Bin_Packing_General1.png"
             />
         </imageobject>
-    </mediaobject>
+    </mediaobject></para>
     <para>On the other hand, a CPU optimized packed server might look
-        like the following figure:</para>
+        like the following figure:
     <mediaobject>
         <imageobject>
-            <imagedata
+            <imagedata contentwidth="4in"
                 fileref="../images/Compute_Tech_Bin_Packing_CPU_optimized1.png"
             />
         </imageobject>
-    </mediaobject>
+    </mediaobject></para>
     <para>These default flavors are well suited to typical load outs
         for commodity server hardware. To maximize utilization,
         however, it may be necessary to customize the flavors or

doc/arch-design/hybrid/section_architecture_hybrid.xml

@@ -20,7 +20,7 @@
         Management Platform.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Cloud_Priv-AWS4.png"
             />
         </imageobject>

doc/arch-design/hybrid/section_prescriptive_examples_hybrid.xml

@@ -39,7 +39,7 @@
         below.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Cloud_Priv-Pub3.png"
             />
         </imageobject>
@@ -79,7 +79,7 @@
         similar to the figure below:</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Cloud_Priv-AWS4.png"
             />
         </imageobject>
@@ -122,7 +122,7 @@
         the figure below:</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Cloud_failover2.png"
             />
         </imageobject>

doc/arch-design/massively_scalable/section_tech_considerations_massively_scalable.xml

@@ -123,7 +123,7 @@
         networks, or GPU cards.</para>
     <mediaobject>
         <imageobject>
-            <imagedata  contentwidth="6in"
+            <imagedata  contentwidth="4in"
                 fileref="../images/Massively_Scalable_Cells_+_regions_+_azs.png"
             />
         </imageobject>

doc/arch-design/multi_site/section_architecture_multi_site.xml

@@ -17,7 +17,7 @@
         depending on the user and technical requirements.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Site_shared_keystone_horizon_swift1.png"/>
         </imageobject>
     </mediaobject>

doc/arch-design/multi_site/section_prescriptive_examples_multi_site.xml

@@ -78,7 +78,7 @@
         and paired edge data centers:</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Site_Customer_Edge.png"/>
         </imageobject>
     </mediaobject>
@@ -180,7 +180,7 @@
         redundant and does have any awareness of geo location.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-site_Geo_Redundant_LB.png"/>
         </imageobject>
     </mediaobject></section>
@@ -212,7 +212,7 @@
         site where the application completes the request.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Multi-Site_shared_keystone1.png"/>
         </imageobject>
     </mediaobject></section>

doc/arch-design/network_focus/section_prescriptive_examples_network_focus.xml

@@ -34,14 +34,14 @@
         and configured to use the Open vSwitch agent in GRE tunnel
         mode. This ensures all devices can reach all other devices and
         that tenant networks can be created for private addressing
-        links to the load balancer.</para>
+        links to the load balancer.
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Network_Web_Services1.png"
             />
         </imageobject>
-    </mediaobject>
+    </mediaobject></para>
     <para>A web service architecture has many options and optional
         components. Due to this, it can fit into a large number of
         other OpenStack designs however a few key components will need
@@ -173,7 +173,7 @@
         traffic.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Network_Cloud_Storage2.png"
             />
         </imageobject>

doc/arch-design/specialized/section_hardware_specialized.xml

@@ -39,7 +39,7 @@
         https://wiki.openstack.org/wiki/Pci_passthrough#How_to_check_PCI_status_with_PCI_api_patches.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in" fileref="../images/Specialized_Hardware2.png"/>
+            <imagedata contentwidth="4in" fileref="../images/Specialized_Hardware2.png"/>
         </imageobject>
     </mediaobject></section>
 </section>

doc/arch-design/specialized/section_multi_hypervisor_specialized.xml

@@ -23,7 +23,7 @@
         OpenStack.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Compute_NSX.png"
             />
         </imageobject>

doc/arch-design/specialized/section_openstack_on_openstack_specialized.xml

@@ -62,7 +62,7 @@
     <section xml:id="nested-cloud-diagram"><title>Diagram</title>
     <para><mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Specialized_OOO.png"
             />
         </imageobject>

doc/arch-design/specialized/section_software_defined_networking_specialized.xml

@@ -34,18 +34,18 @@
         device support, use a tunnel that terminates at the switch
         hardware itself.</para></section>
     <section xml:id="diagram-sdn"><title>Diagram</title>
-    <para>OpenStack hosted SDN controller:</para>
+    <para>OpenStack hosted SDN controller:
     <mediaobject>
         <imageobject>
             <imagedata fileref="../images/Special_case_SDN_hosted.png"
             />
         </imageobject>
-    </mediaobject>
+    </mediaobject></para>
-    <para>OpenStack participating in an SDN controller network:</para>
+    <para>OpenStack participating in an SDN controller network:
     <mediaobject>
         <imageobject>
             <imagedata
                 fileref="../images/Special_case_SDN_external.png"/>
         </imageobject>
-    </mediaobject></section>
+    </mediaobject></para></section>
 </section>

doc/arch-design/storage_focus/section_prescriptive_examples_storage_focus.xml

@@ -18,14 +18,14 @@
         spindles.</para>
     <para>Swift is a highly scalable object store that is part of the
         OpenStack project. This is a diagram to explain the example
-        architecture:</para>
+        architecture:
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Storage_Object.png"
             />
         </imageobject>
-    </mediaobject>
+    </mediaobject></para>
     <para>This example uses the following components:</para>
     <para>Network:</para>
     <itemizedlist>
@@ -74,14 +74,14 @@
     <para>This example discusses an OpenStack Object Store with a high
         performance requirement. OpenStack has integration with Hadoop
         through the Sahara project, which is leveraged to manage the
-        Hadoop cluster within the cloud.</para>
+        Hadoop cluster within the cloud.
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Storage_Hadoop3.png"
             />
         </imageobject>
-    </mediaobject>
+    </mediaobject></para>
     <para>The actual hardware requirements and configuration are
         similar to those of the High Performance Database example
         below. In this case, the architecture uses Ceph's
@@ -111,7 +111,7 @@
         SSD cache layer.</para>
     <mediaobject>
         <imageobject>
-            <imagedata contentwidth="6in"
+            <imagedata contentwidth="4in"
                 fileref="../images/Storage_Database_+_Object5.png"
             />
         </imageobject>