openstack/openstack-manuals
Code Issues Proposed changes

Merge "Training guide: Fix diagrams for PDF output"

Browse Source
This commit is contained in:
Jenkins
2014-05-07 06:37:46 +00:00
committed by Gerrit Code Review
parent 1bd914b372 a3d8ad2e5f
commit be69c04d31
10 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
doc/training-guides/lab000-virtualbox-basics.xml
View File

@@ -130,7 +130,7 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Network Diagram</title> <title>Network Diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata width="4in" fileref="figures/lab000-virtual-box/image03.png"/> <imagedata contentwidth="4in" fileref="figures/lab000-virtual-box/image03.png"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -202,7 +202,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Create Host Only Networks</title> <title>Create Host Only Networks</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image13.png"/> <imagedata fileref="figures/lab000-virtual-box/image13.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -246,7 +247,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Vboxnet0</title> <title>Vboxnet0</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image19.png"/> <imagedata fileref="figures/lab000-virtual-box/image19.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -281,7 +283,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Vboxnet1</title> <title>Vboxnet1</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image16.png"/> <imagedata fileref="figures/lab000-virtual-box/image16.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -315,7 +318,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Image: Vboxnet2</title> <title>Image: Vboxnet2</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image08.png"/> <imagedata fileref="figures/lab000-virtual-box/image08.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -364,7 +368,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Create New Virtual Machine</title> <title>Create New Virtual Machine</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image11.png"/> <imagedata fileref="figures/lab000-virtual-box/image11.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -404,7 +409,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter1 - Vboxnet0</title> <title>Adapter1 - Vboxnet0</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image07.png"/> <imagedata fileref="figures/lab000-virtual-box/image07.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -413,7 +419,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter2 - Vboxnet2</title> <title>Adapter2 - Vboxnet2</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image18.png"/> <imagedata fileref="figures/lab000-virtual-box/image18.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -422,7 +429,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter3 - NAT</title> <title>Adapter3 - NAT</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image14.png"/> <imagedata fileref="figures/lab000-virtual-box/image14.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -441,7 +449,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Create New Virtual Machine</title> <title>Create New Virtual Machine</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image12.png"/> <imagedata fileref="figures/lab000-virtual-box/image12.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -483,7 +492,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter 1 - Vboxnet0</title> <title>Adapter 1 - Vboxnet0</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image05.png"/> <imagedata fileref="figures/lab000-virtual-box/image05.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -492,7 +502,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter2 - Vboxnet1</title> <title>Adapter2 - Vboxnet1</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image17.png"/> <imagedata fileref="figures/lab000-virtual-box/image17.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -501,7 +512,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter3 - Vboxnet2</title> <title>Adapter3 - Vboxnet2</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image02.png"/> <imagedata fileref="figures/lab000-virtual-box/image02.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -510,7 +522,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter4 - NAT</title> <title>Adapter4 - NAT</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image00.png"/> <imagedata fileref="figures/lab000-virtual-box/image00.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -528,7 +541,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Create New Virtual Machine</title> <title>Create New Virtual Machine</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image04.png"/> <imagedata fileref="figures/lab000-virtual-box/image04.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -565,7 +579,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter1 - Vboxnet0</title> <title>Adapter1 - Vboxnet0</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image15.png"/> <imagedata fileref="figures/lab000-virtual-box/image15.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -574,7 +589,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter2 - Vboxnet1</title> <title>Adapter2 - Vboxnet1</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image10.png"/> <imagedata fileref="figures/lab000-virtual-box/image10.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -583,7 +599,8 @@ KVM acceleration can NOT be used</computeroutput></screen>
<title>Adapter3 - NAT</title> <title>Adapter3 - NAT</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image01.png"/> <imagedata fileref="figures/lab000-virtual-box/image01.png"
contentwidth="6in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

3
doc/training-guides/lab001-control-node.xml
View File

@@ -9,7 +9,8 @@
<title>Network Diagram</title> <title>Network Diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image03.png"/> <imagedata fileref="figures/lab000-virtual-box/image03.png"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

3
doc/training-guides/lab002-network-node.xml
View File

@@ -11,7 +11,8 @@
<title>Network Diagram</title> <title>Network Diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image03.png"/> <imagedata fileref="figures/lab000-virtual-box/image03.png"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

3
doc/training-guides/lab003-compute-node.xml
View File

@@ -14,7 +14,8 @@
<title>Network Diagram</title> <title>Network Diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/lab000-virtual-box/image03.png"/> <imagedata fileref="figures/lab000-virtual-box/image03.png"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

9
doc/training-guides/module001-ch004-openstack-architecture.xml
View File

@@ -23,7 +23,8 @@
<title>Conceptual Diagram</title> <title>Conceptual Diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image13.jpg"/> <imagedata fileref="figures/image13.jpg"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -66,7 +67,8 @@ as previously described:</para>
<title>Logical diagram</title> <title>Logical diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/openstack-arch-havana-logical-v1.jpg"/> <imagedata fileref="figures/openstack-arch-havana-logical-v1.jpg"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -96,7 +98,8 @@ as previously described:</para>
<title>Horizon Dashboard</title> <title>Horizon Dashboard</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image10.jpg"/> <imagedata fileref="figures/image10.jpg"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

6
doc/training-guides/module001-ch005-vm-provisioning-walk-through.xml
View File

@@ -175,7 +175,7 @@
<title>Initial State</title> <title>Initial State</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image21.png"/> <imagedata fileref="figures/image21.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -194,7 +194,7 @@
<title>Launch VM Instance</title> <title>Launch VM Instance</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image09.png"/> <imagedata fileref="figures/image09.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -231,7 +231,7 @@
<title>End State</title> <title>End State</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image22.png"/> <imagedata fileref="figures/image22.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

10
doc/training-guides/module001-ch008-queues-messaging.xml
View File

@@ -8,7 +8,7 @@
<title>Messaging in OpenStack</title> <title>Messaging in OpenStack</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image04.png"/> <imagedata fileref="figures/image04.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -44,7 +44,7 @@
<title>AMQP</title> <title>AMQP</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image24.png"/> <imagedata fileref="figures/image24.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -146,7 +146,7 @@
<title>RabbitMQ</title> <title>RabbitMQ</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image20.png"/> <imagedata fileref="figures/image20.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -181,7 +181,7 @@
<title>RabbitMQ</title> <title>RabbitMQ</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image28.png"/> <imagedata fileref="figures/image28.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -204,7 +204,7 @@
<title>RabbitMQ</title> <title>RabbitMQ</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image20.png"/> <imagedata fileref="figures/image20.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

7
doc/training-guides/module001-ch009-vm-placement.xml
View File

@@ -16,7 +16,7 @@
<title>Nova</title> <title>Nova</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image29.png"/> <imagedata fileref="figures/image29.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -56,7 +56,7 @@
<title>Filtering</title> <title>Filtering</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image27.png"/> <imagedata fileref="figures/image27.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>
@@ -196,7 +196,8 @@
<title>Weights</title> <title>Weights</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="../common/figures/nova-weighting-hosts.png"/> <imagedata fileref="../common/figures/nova-weighting-hosts.png"
contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

2
doc/training-guides/module001-ch010-vm-provisioning-indepth.xml
View File

@@ -210,7 +210,7 @@
<title>Nova VM provisioning</title> <title>Nova VM provisioning</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image02.png"/> <imagedata fileref="figures/image02.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>

2
doc/training-guides/module002-ch001-networking-in-openstack.xml
View File

@@ -228,7 +228,7 @@
<title>Network Diagram</title> <title>Network Diagram</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="figures/image33.png"/> <imagedata fileref="figures/image33.png" contentwidth="7in"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>
</figure> </figure>