changed images, added font configs

This commit is contained in:
Pavel Lechenko 2013-08-05 18:16:41 +04:00
parent a816e22863
commit 8b549c54f0
15 changed files with 295 additions and 68 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/_build
/_images/*_svg.png
/_images/*_svg.jpg
/.idea

View File

@ -15,8 +15,9 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
IMAGEDIRS = _images
SVG2PNG = convert
SVG2PNG_FLAGS =
SVG2JPG = convert
# JPGs will be resized to 600px width
SVG2JPG_FLAGS = -resize 600x
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf pdf text man changes linkcheck doctest gettext
@ -45,17 +46,17 @@ help:
clean:
-rm -rf $(BUILDDIR)/*
-@rm -f $(PNGs)
-@rm -f $(JPGs)
# Pattern rule for converting SVG to PNG
%_svg.png : %.svg
$(SVG2PNG) $(SVG2PNG_FLAGS) $< $@
# Pattern rule for converting SVG to JPG
%_svg.jpg : %.svg
$(SVG2JPG) $(SVG2JPG_FLAGS) $< $@
# Build a list of SVG files to convert to PNGs
PNGs := $(foreach dir, $(IMAGEDIRS), $(patsubst %.svg,%_svg.png,$(wildcard $(dir)/*.svg)))
# Build a list of SVG files to convert to JPGs
JPGs := $(foreach dir, $(IMAGEDIRS), $(patsubst %.svg,%_svg.jpg,$(wildcard $(dir)/*.svg)))
# Make a rule to build the PNGs
images: $(PNGs)
# Make a rule to build the JPGs
images: $(JPGs)
all: clean html dirhtml singlehtml latexpdf pdf

260
_fonts/type.xml Normal file
View File

@ -0,0 +1,260 @@
<?xml version="1.0"?>
<typemap>
<type
format="ttf"
name="PTSansCaption"
fullname="PT Sans Caption"
family="PT Sans Caption"
glyphs="_fonts/PTC55F.ttf"
/>
<type
format="ttf"
name="PTSansCaption"
fullname="PT Sans Caption"
family="PT Sans Caption"
glyphs="_fonts/PTC55F_W.ttf"
/>
<type
format="ttf"
name="PTSansCaptionB"
fullname="PT Sans Caption Bold"
family="PT Sans Caption"
glyphs="_fonts/PTC75F.ttf"
/>
<type
format="ttf"
name="PTSansCaptionB"
fullname="PT Sans Caption Bold"
family="PT Sans Caption"
glyphs="_fonts/PTC75F_W.ttf"
/>
<type
format="ttf"
name="PTSerif"
fullname="PT Serif"
family="PT Serif"
glyphs="_fonts/PTF55F.ttf"
/>
<type
format="ttf"
name="PTSerif"
fullname="PT Serif"
family="PT Serif"
glyphs="_fonts/PTF55F_W.ttf"
/>
<type
format="ttf"
name="PTSerifI"
fullname="PT Serif Italic"
family="PT Serif"
glyphs="_fonts/PTF56F.ttf"
/>
<type
format="ttf"
name="PTSerifI"
fullname="PT Serif Italic"
family="PT Serif"
glyphs="_fonts/PTF56F_W.ttf"
/>
<type
format="ttf"
name="PTSerifB"
fullname="PT Serif Bold"
family="PT Serif"
glyphs="_fonts/PTF75F.ttf"
/>
<type
format="ttf"
name="PTSerifB"
fullname="PT Serif Bold"
family="PT Serif"
glyphs="_fonts/PTF75F_W.ttf"
/>
<type
format="ttf"
name="PTSerifBI"
fullname="PT Serif Bold Italic"
family="PT Serif"
glyphs="_fonts/PTF76F.ttf"
/>
<type
format="ttf"
name="PTSerifBI"
fullname="PT Serif Bold Italic"
family="PT Serif"
glyphs="_fonts/PTF76F_W.ttf"
/>
<type
format="ttf"
name="PTMono"
fullname="PT Mono"
family="PT Mono"
glyphs="_fonts/PTM55F.ttf"
/>
<type
format="ttf"
name="PTMono"
fullname="PT Mono"
family="PT Mono"
glyphs="_fonts/PTM55F_W.ttf"
/>
<type
format="ttf"
name="PTMonoB"
fullname="PT Mono Bold"
family="PT Mono"
glyphs="_fonts/PTM75F.ttf"
/>
<type
format="ttf"
name="PTMonoB"
fullname="PT Mono Bold"
family="PT Mono"
glyphs="_fonts/PTM75F_W.ttf"
/>
<type
format="ttf"
name="PTSansNarrow"
fullname="PT Sans Narrow"
family="PT Sans Narrow"
glyphs="_fonts/PTN57F.ttf"
/>
<type
format="ttf"
name="PTSansNarrow"
fullname="PT Sans Narrow"
family="PT Sans Narrow"
glyphs="_fonts/PTN57F_W.ttf"
/>
<type
format="ttf"
name="PTSansNarrowB"
fullname="PT Sans Narrow Bold"
family="PT Sans Narrow"
glyphs="_fonts/PTN77F.ttf"
/>
<type
format="ttf"
name="PTSansNarrowB"
fullname="PT Sans Narrow Bold"
family="PT Sans Narrow"
glyphs="_fonts/PTN77F_W.ttf"
/>
<type
format="ttf"
name="PTSans"
fullname="PT Sans"
family="PT Sans"
glyphs="_fonts/PTS55F.ttf"
/>
<type
format="ttf"
name="PTSans"
fullname="PT Sans"
family="PT Sans"
glyphs="_fonts/PTS55F_W.ttf"
/>
<type
format="ttf"
name="PTSansI"
fullname="PT Sans Italic"
family="PT Sans"
glyphs="_fonts/PTS56F.ttf"
/>
<type
format="ttf"
name="PTSansI"
fullname="PT Sans Italic"
family="PT Sans"
glyphs="_fonts/PTS56F_W.ttf"
/>
<type
format="ttf"
name="PTSansB"
fullname="PT Sans Bold"
family="PT Sans"
glyphs="_fonts/PTS75F.ttf"
/>
<type
format="ttf"
name="PTSansB"
fullname="PT Sans Bold"
family="PT Sans"
glyphs="_fonts/PTS75F_W.ttf"
/>
<type
format="ttf"
name="PTSansBI"
fullname="PT Sans Bold Italic"
family="PT Sans"
glyphs="_fonts/PTS76F.ttf"
/>
<type
format="ttf"
name="PTSansBI"
fullname="PT Sans Bold Italic"
family="PT Sans"
glyphs="_fonts/PTS76F_W.ttf"
/>
<type
format="ttf"
name="PTSerifCaption"
fullname="PT Serif Caption"
family="PT Serif Caption"
glyphs="_fonts/PTZ55F.ttf"
/>
<type
format="ttf"
name="PTSerifCaption"
fullname="PT Serif Caption"
family="PT Serif Caption"
glyphs="_fonts/PTZ55F_W.ttf"
/>
<type
format="ttf"
name="PTSerifCaptionI"
fullname="PT Serif Caption Italic"
family="PT Serif Caption"
glyphs="_fonts/PTZ56F.ttf"
/>
<type
format="ttf"
name="PTSerifCaptionI"
fullname="PT Serif Caption Italic"
family="PT Serif Caption"
glyphs="_fonts/PTZ56F_W.ttf"
/>
</typemap>

View File

@ -20,7 +20,4 @@ through a single installation.
Simply put, Fuel is a way for you to easily configure and install an
OpenStack-based infrastructure in your own environment.
.. fancybox:: /_images/FuelSimpleDiagramv.png
:width: 400px
:height: 400px
.. image:: /_images/FuelSimpleDiagramv.jpg

View File

@ -24,9 +24,7 @@ In practice, that means that the process of using Fuel looks like 1-2-3:
All of this is desgined to enable you to maintain your cluster while giving
you the flexibility to adapt it to your own configuration.
.. fancybox:: /_images/how-it-works_svg.png
:width: 400px
:height: 400px
.. image:: /_images/how-it-works_svg.jpg
Fuel comes with several pre-defined deployment configurations, some of them
include additional configuration options that allow you to adapt OpenStack

View File

@ -113,7 +113,7 @@ Fuel on VirtualBox by following these steps.
helper scripts or install Fuel :ref:`Install_Bare-Metal`.
Master Node deployment
~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~
First, create the Master Node VM.
@ -150,11 +150,11 @@ Next, create Slave nodes where OpenStack needs to be installed.
2. Set priority for the network boot:
.. image:: /_images/vbox-image1.png
.. image:: /_images/vbox-image1.jpg
3. Configure the network adapter on each VM:
.. image:: /_images/vbox-image2.png
.. image:: /_images/vbox-image2.jpg
Changing network parameters before the installation
---------------------------------------------------
@ -168,7 +168,7 @@ example, to use 192.168.1.10/24 IP address for the Master Node and 192.168.1.1
as the gateway and DNS server you should change the parameters to those shown
in the image below:
.. image:: /_images/network-at-boot.png
.. image:: /_images/network-at-boot.jpg
When you're finished making changes, press the <ENTER> key and wait for the
installation to complete.

View File

@ -11,9 +11,7 @@ interfaces do not receive certain VLAN IDs. Usually it means that switch or
multiple switches are not configured correctly and do not allow certain
tagged traffic to pass through.
.. fancybox:: /_images/net_verify_failure.png
:width: 600px
:height: 200px
.. image:: /_images/net_verify_failure.jpg
On VirtualBox
-------------

View File

@ -211,7 +211,7 @@ Configuring the network
Once you choose a networking mode (FlatDHCP/VLAN), you must configure equipment
accordingly. The diagram below shows an example configuration.
.. image:: /_images/physical_sample.png
.. image:: /_images/physical_sample.jpg
:width: 100%
Fuel operates with following logical networks:
@ -236,9 +236,7 @@ types of traffic. When a node is added to the environment, click at the bottom
line of the node icon. In the detailed information window, click the "Network
Configuration" button to open the physical interfaces configuration screen.
.. fancybox:: /_images/doc_network-settings-help.png
:width: 600px
:height: 600px
.. image:: /_images/doc_network-settings-help.jpg
On this screen you can drag-and-drop logical networks to physical interfaces
according to your network setup.

View File

@ -56,7 +56,7 @@ Running post-deployment checks
Now, let`s take a closer look on what should be done to execute the tests and
to understand if something is wrong with your OpenStack cluster.
.. image:: /_images/healthcheck_tab.png
.. image:: /_images/healthcheck_tab.jpg
As you can see on the image above, the Fuel UI now contains a ``Healthcheck``
tab, indicated by the Heart icon.
@ -84,9 +84,7 @@ this section.
An actual test run looks like this:
.. fancybox:: /_images/ostf_screen.png
:width: 600px
:height: 330px
.. image:: /_images/ostf_screen.jpg
What should be done when a test failed
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

View File

@ -51,9 +51,7 @@ profiles and distributions. Similarly, Puppet Master can be kept in sync with a
combination of rsync (for modules, manifests, and SSL data) and database
replication.
.. image:: /_images/cobbler-puppet-ha.png
:width: 400px
:height: 190px
.. image:: /_images/cobbler-puppet-ha.jpg
Downloading of operating systems and other software
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

View File

@ -55,9 +55,7 @@ of compromises as to the number and types of services that you can
deploy. It is, however, extremely useful if you just want to see how
OpenStack works from a user's point of view.
.. fancybox:: /_images/deployment-simple_svg.png
:width: 400px
:height: 200px
.. image:: /_images/deployment-simple_svg.jpg
More commonly, your OpenStack installation will consist of multiple
servers. Exactly how many is up to you, of course, but the main idea
@ -80,9 +78,7 @@ single points of failure. That's not to say, however, that you can't
reduce hardware requirements by combining your storage, network, and controller
nodes:
.. fancybox:: /_images/deployment-ha-compact_svg.png
:width: 400px
:height: 250px
.. image:: /_images/deployment-ha-compact_svg.jpg
.. index:: Deployment Configurations; Full HA
@ -94,9 +90,7 @@ dedicated hardware for storage. This architecture gives you the advantages of
high availability, but this clean separation makes your cluster more
maintainable by separating storage and controller functionality:
.. fancybox:: /_images/deployment-ha-full_svg.png
:width: 400px
:height: 200px
.. image:: /_images/deployment-ha-full_svg.jpg
Where Fuel really shines is in the creation of more complex architectures, so
in this document you'll learn how to use Fuel to easily create a multi-node HA

View File

@ -5,9 +5,7 @@ In this section, you'll learn more about the Multi-node (HA) Compact
deployment configuration and how it achieves high availability. As you may
recall, this configuration looks something like this:
.. fancybox:: /_images/deployment-ha-compact_svg.png
:width: 400px
:height: 250px
.. image:: /_images/deployment-ha-compact_svg.jpg
OpenStack services are interconnected by RESTful HTTP-based APIs and
AMQP-based RPC messages. So redundancy for stateless OpenStack API
@ -18,9 +16,7 @@ rely on their respective active/active modes for high availability.
For example, RabbitMQ uses built-in clustering capabilities, while the
database uses MySQL/Galera replication.
.. fancybox:: /_images/ha-overview_svg.png
:width: 400px
:height: 250px
.. image:: /_images/ha-overview_svg.jpg
Lets take a closer look at what an OpenStack deployment looks like, and
what it will take to achieve high availability for an OpenStack

View File

@ -14,9 +14,7 @@ You must keep in mind, however, that the database uses Galera to
achieve HA, and Galera is a quorum-based system. That means that you must provide
at least 3 controller nodes.
.. fancybox:: /_images/logical-diagram-controller_svg.png
:width: 400px
:height: 400px
.. image:: /_images/logical-diagram-controller_svg.jpg
Every OpenStack controller runs HAProxy, which manages a single External
Virtual IP (VIP) for all controller nodes and provides HTTP and TCP load
@ -54,9 +52,7 @@ as RabbitMQ and MySQL. They use the same approach that provides
redundancy to the end-users of Horizon and REST APIs, reaching out to
controller nodes using the VIP and going through HAProxy.
.. fancybox:: /_images/logical-diagram-compute_svg.png
:width: 400px
:height: 180px
.. image:: /_images/logical-diagram-compute_svg.jpg
Storage Nodes
^^^^^^^^^^^^^
@ -68,6 +64,4 @@ achieve this, you are going to deploy Swift. This enables you to use
it not only for storing VM images, but also for any other objects such
as user files.
.. fancybox:: /_images/logical-diagram-storage_svg.png
:width: 400px
:height: 200px
.. image:: /_images/logical-diagram-storage_svg.jpg

View File

@ -15,9 +15,7 @@ deployment is to allocate 4 nodes:
- 1 compute node
.. fancybox:: /_images/deployment-ha-compact_svg.png
:width: 400px
:height: 250px
.. image:: /_images/deployment-ha-compact_svg.jpg
If you want to run storage separately from the controllers, you can do that as
well by raising the bar to 9 nodes:
@ -30,9 +28,7 @@ well by raising the bar to 9 nodes:
- 1 Compute node
.. fancybox:: /_images/deployment-ha-full_svg.png
:width: 400px
:height: 200px
.. image:: /_images/deployment-ha-full_svg.jpg
Of course, you are free to choose how to deploy OpenStack based on the
amount of available hardware and on your goals (such as whether you

View File

@ -21,9 +21,7 @@ In the multi-host networking mode, you can choose between the FlatDHCPManager
and VlanManager network managers in OpenStack. The figure below illustrates the
relevant nodes and networks.
.. fancybox:: /_images/080-networking-diagram_svg.png
:width: 400px
:height: 500px
.. image:: /_images/080-networking-diagram_svg.jpg
Lets take a closer look at each network and how its used within the cluster.