diff --git a/.gitignore b/.gitignore
index 4a45ca96d..b064f1769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/_build
/_images/*_svg.png
+/_images/*_svg.jpg
/.idea
diff --git a/Makefile b/Makefile
index 556a23304..76aede02c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/_fonts/type.xml b/_fonts/type.xml
new file mode 100644
index 000000000..566ae4dbc
--- /dev/null
+++ b/_fonts/type.xml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/about-fuel/0020-what-is-fuel.rst b/pages/about-fuel/0020-what-is-fuel.rst
index 9ed113f52..f8df78254 100644
--- a/pages/about-fuel/0020-what-is-fuel.rst
+++ b/pages/about-fuel/0020-what-is-fuel.rst
@@ -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
diff --git a/pages/about-fuel/0030-how-it-works.rst b/pages/about-fuel/0030-how-it-works.rst
index acd9ca7bc..f7ed9776f 100644
--- a/pages/about-fuel/0030-how-it-works.rst
+++ b/pages/about-fuel/0030-how-it-works.rst
@@ -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
diff --git a/pages/installation-fuel-ui/install.rst b/pages/installation-fuel-ui/install.rst
index 68e56beb0..610c74301 100644
--- a/pages/installation-fuel-ui/install.rst
+++ b/pages/installation-fuel-ui/install.rst
@@ -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 key and wait for the
installation to complete.
diff --git a/pages/installation-fuel-ui/network-issues.rst b/pages/installation-fuel-ui/network-issues.rst
index 847464099..c88e25a74 100644
--- a/pages/installation-fuel-ui/network-issues.rst
+++ b/pages/installation-fuel-ui/network-issues.rst
@@ -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
-------------
diff --git a/pages/installation-fuel-ui/networks.rst b/pages/installation-fuel-ui/networks.rst
index 0758669c4..9b78e7594 100644
--- a/pages/installation-fuel-ui/networks.rst
+++ b/pages/installation-fuel-ui/networks.rst
@@ -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.
diff --git a/pages/installation-fuel-ui/post-install-healthchecks.rst b/pages/installation-fuel-ui/post-install-healthchecks.rst
index 5a6fa2046..49869275e 100644
--- a/pages/installation-fuel-ui/post-install-healthchecks.rst
+++ b/pages/installation-fuel-ui/post-install-healthchecks.rst
@@ -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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/pages/production-considerations/0030-large-deployments.rst b/pages/production-considerations/0030-large-deployments.rst
index 566f8a8a9..c85b1efbb 100644
--- a/pages/production-considerations/0030-large-deployments.rst
+++ b/pages/production-considerations/0030-large-deployments.rst
@@ -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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/pages/reference-architecture/0010-overview.rst b/pages/reference-architecture/0010-overview.rst
index ffe3ecc9c..0340a88c2 100644
--- a/pages/reference-architecture/0010-overview.rst
+++ b/pages/reference-architecture/0010-overview.rst
@@ -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
diff --git a/pages/reference-architecture/0015-closer-look.rst b/pages/reference-architecture/0015-closer-look.rst
index e1a60ae6f..6b9078cf1 100644
--- a/pages/reference-architecture/0015-closer-look.rst
+++ b/pages/reference-architecture/0015-closer-look.rst
@@ -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
diff --git a/pages/reference-architecture/0020-logical-setup.rst b/pages/reference-architecture/0020-logical-setup.rst
index eaffab163..209931b67 100644
--- a/pages/reference-architecture/0020-logical-setup.rst
+++ b/pages/reference-architecture/0020-logical-setup.rst
@@ -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
diff --git a/pages/reference-architecture/0030-cluster-sizing.rst b/pages/reference-architecture/0030-cluster-sizing.rst
index aba57da69..108d9f130 100644
--- a/pages/reference-architecture/0030-cluster-sizing.rst
+++ b/pages/reference-architecture/0030-cluster-sizing.rst
@@ -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
diff --git a/pages/reference-architecture/0040-network-setup.rst b/pages/reference-architecture/0040-network-setup.rst
index fe7d91988..ed04e5ac2 100644
--- a/pages/reference-architecture/0040-network-setup.rst
+++ b/pages/reference-architecture/0040-network-setup.rst
@@ -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.