install and use new network diagrams

This commit is contained in:
Dietmar Maurer 2018-08-16 10:10:08 +02:00
parent 1ff5e4e80e
commit 50f88938f6
3 changed files with 18 additions and 1 deletions

View File

@ -202,6 +202,8 @@ $(DOC_DEB): index.html $(WIKI_IMPORTS) $(API_VIEWER_SOURCES) verify-images
install -dm755 build-$(DOC_PACKAGE)/usr/share/doc/${DOC_PACKAGE} install -dm755 build-$(DOC_PACKAGE)/usr/share/doc/${DOC_PACKAGE}
install -m 0644 index.html ${INDEX_INCLUDES} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE} install -m 0644 index.html ${INDEX_INCLUDES} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}
install -m 0644 ${WIKI_IMPORTS} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE} install -m 0644 ${WIKI_IMPORTS} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}
# install images
make -C images DESTDIR=../build-$(DOC_PACKAGE) install
# install screenshot images # install screenshot images
install -dm755 build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot install -dm755 build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot
install -m 0644 images/screenshot/*.png build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot install -m 0644 images/screenshot/*.png build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot

View File

@ -1,5 +1,10 @@
all: TT_SOURCES= \
default-network-setup-bond.tt \
default-network-setup-routed.tt \
default-network-setup-bridge.tt
all: $(TT_SOURCES:.tt=.svg)
%.tmp.dot: %.tt pve_network_templates.tt %.tmp.dot: %.tt pve_network_templates.tt
tpage $*.tt >$*.tmp.dot tpage $*.tt >$*.tmp.dot
@ -7,6 +12,13 @@ all:
%.svg: %.tmp.dot %.svg: %.tmp.dot
dot $*.tmp.dot -T svg -o $*.svg dot $*.tmp.dot -T svg -o $*.svg
update:
rm -f $(TT_SOURCES:.tt=.svg)
make $(TT_SOURCES:.tt=.svg)
install: $(TT_SOURCES:.tt=.svg)
install -d -m 0755 $(DESTDIR)/usr/share/pve-docs/images
install -m 0644 $(TT_SOURCES:.tt=.svg) $(DESTDIR)/usr/share/pve-docs/images
clean: clean:
rm -f *.tmp.dot rm -f *.tmp.dot

View File

@ -102,6 +102,7 @@ virtual networks.
Default Configuration using a Bridge Default Configuration using a Bridge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[thumbnail="default-network-setup-bridge.svg"]
Bridges are like physical network switches implemented in software. Bridges are like physical network switches implemented in software.
All VMs can share a single bridge, or you can create multiple bridges to All VMs can share a single bridge, or you can create multiple bridges to
separate network domains. Each host can have up to 4094 bridges. separate network domains. Each host can have up to 4094 bridges.
@ -146,6 +147,7 @@ You can avoid the problem by ``routing'' all traffic via a single
interface. This makes sure that all network packets use the same MAC interface. This makes sure that all network packets use the same MAC
address. address.
[thumbnail="default-network-setup-routed.svg"]
A common scenario is that you have a public IP (assume `198.51.100.5` A common scenario is that you have a public IP (assume `198.51.100.5`
for this example), and an additional IP block for your VMs for this example), and an additional IP block for your VMs
(`203.0.113.16/29`). We recommend the following setup for such (`203.0.113.16/29`). We recommend the following setup for such
@ -314,6 +316,7 @@ iface vmbr0 inet static
---- ----
[thumbnail="default-network-setup-bond.svg"]
Another possibility it to use the bond directly as bridge port. Another possibility it to use the bond directly as bridge port.
This can be used to make the guest network fault-tolerant. This can be used to make the guest network fault-tolerant.