summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-05 09:27:10 +0000
committerGerrit Code Review <review@openstack.org>2016-04-05 09:27:10 +0000
commit2556778917b31ffdff2b26e5e9bb2102c8dd77a7 (patch)
tree524bdb01c1cecff100b705b9db11f7b908f79897
parentae6a94b784bb1d8f8202677d41eca7ccb751ca52 (diff)
parentdb6029397a6e8ad451ce697389e30db45d501843 (diff)
Merge "Fix indentation"
-rw-r--r--doc/build/latex/fuel-plugin-xenserver.pdfbin296837 -> 303700 bytes
-rw-r--r--doc/source/guide.rst4
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/latex/fuel-plugin-xenserver.pdf b/doc/build/latex/fuel-plugin-xenserver.pdf
index abf5a19..95e3c0b 100644
--- a/doc/build/latex/fuel-plugin-xenserver.pdf
+++ b/doc/build/latex/fuel-plugin-xenserver.pdf
Binary files differ
diff --git a/doc/source/guide.rst b/doc/source/guide.rst
index a5c84c1..f61a44c 100644
--- a/doc/source/guide.rst
+++ b/doc/source/guide.rst
@@ -22,13 +22,13 @@ Prepare infrastructure
22 22
233. While many networking setups are expected to work, the following setup is known to work: 233. While many networking setups are expected to work, the following setup is known to work:
24 24
25 - Physical machines with three ethernet devices: 25 - Physical machines with three ethernet devices:
26 26
27 - eth0 / “Access network”: Used to access the XenServer hosts and the Fuel Master’s web interface 27 - eth0 / “Access network”: Used to access the XenServer hosts and the Fuel Master’s web interface
28 - eth1 / “Control network”: OpenStack control plane (management and storage), the PXE network, private network and the public network; all separated by VLAN tags. The public network is also on this network, and if a VLAN is required this is applied by the switch for untagged traffic. 28 - eth1 / “Control network”: OpenStack control plane (management and storage), the PXE network, private network and the public network; all separated by VLAN tags. The public network is also on this network, and if a VLAN is required this is applied by the switch for untagged traffic.
29 - eth2 / “Private”: This version of the plugin only supports VLAN segmentation for Neutron networking. This device carries all of the VLANs to be used by Neutron for VM traffic. 29 - eth2 / “Private”: This version of the plugin only supports VLAN segmentation for Neutron networking. This device carries all of the VLANs to be used by Neutron for VM traffic.
30 30
31 - One virtual network 31 - One virtual network
32 32
33 - VLAN 'pxe' on eth1 / “PXE network”: Used for node bootstrapping. 33 - VLAN 'pxe' on eth1 / “PXE network”: Used for node bootstrapping.
34 34