This commit is contained in:
forgejo-actions 2026-10-12 13:08:39 +00:00
commit 682b66282c
3 changed files with 10 additions and 6 deletions

View file

@ -819,6 +819,10 @@ au VPC (IRB symétrique, <a class="reference external" href="https://git.g3e.fr/
plus besoin de porter un subnet pour joindre ses VM. Sans <code class="docutils literal notranslate"><span class="pre">l3vni</span></code>, le VPC se comporte comme
avant. Le champ exige la section <code class="docutils literal notranslate"><span class="pre">bgp</span></code> de l’agent (<a class="reference internal" href="../exploitation/configuration.html"><span class="doc">Configuration</span></a>) et ne
se change pas après création.</p>
<p><strong>Plan de VNI.</strong> L3VNI et <code class="docutils literal notranslate"><span class="pre">vxlan_id</span></code> des subnets partagent l’espace des VNI VXLAN : la plage
<strong>1–65535</strong> (sauf 253–255, tables du noyau) est réservée aux L3VNI des VPC, <strong>65536–16777215</strong> aux
subnets. L’agent n’impose que la première borne (le RD <code class="docutils literal notranslate"><span class="pre">&lt;VTEP&gt;:&lt;l3vni&gt;</span></code> porte un numéro sur
16 bits) ; le respect du plan revient à l’appelant, qui alloue les deux.</p>
<p>À la création, l’agent pose sur l’hyperviseur, pour un VPC <code class="docutils literal notranslate"><span class="pre">vp-&lt;id&gt;</span></code> :</p>
<div class="highlight-text notranslate"><div class="highlight"><pre><span></span>vrf-&lt;id&gt; VRF, table de routage = l3vni
├── brl3-&lt;id&gt; bridge sans adresse, MAC de routeur 02:02:&lt;IPv4 du VTEP&gt;

View file

@ -600,11 +600,11 @@ portés par un switch). Exemple livré, <code class="docutils literal notranslat
<span class="nt"> loopback</span><span class="p">:</span><span class="w"> </span><span class="nv">10.255.255.1/32</span><span class="p p-Indicator">,</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/rr1.conf</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="nt">hv1</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">hypervisor</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">4</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">16384</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.11</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/hv1.conf</span><span class="p p-Indicator">,</span><span class="nt"> release</span><span class="p">:</span><span class="w"> </span><span class="nv">0.2.0rc007</span><span class="p p-Indicator">,</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.11</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/hv1.conf</span><span class="p p-Indicator">,</span><span class="nt"> release</span><span class="p">:</span><span class="w"> </span><span class="nv">0.2.0rc008</span><span class="p p-Indicator">,</span>
<span class="nt"> agent</span><span class="p">:</span><span class="w"> </span><span class="nv">agent/two.yml</span><span class="w"> </span><span class="p p-Indicator">}</span>
<span class="w"> </span><span class="nt">hv2</span><span class="p">:</span>
<span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> role</span><span class="p">:</span><span class="w"> </span><span class="nv">hypervisor</span><span class="p p-Indicator">,</span><span class="nt"> image</span><span class="p">:</span><span class="w"> </span><span class="nv">debian12</span><span class="p p-Indicator">,</span><span class="nt"> cpus</span><span class="p">:</span><span class="w"> </span><span class="nv">4</span><span class="p p-Indicator">,</span><span class="nt"> memory</span><span class="p">:</span><span class="w"> </span><span class="nv">16384</span><span class="p p-Indicator">,</span><span class="nt"> segments</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">[</span><span class="nv">underlay</span><span class="p p-Indicator">],</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.12</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/hv2.conf</span><span class="p p-Indicator">,</span><span class="nt"> release</span><span class="p">:</span><span class="w"> </span><span class="nv">0.2.0rc007</span><span class="p p-Indicator">,</span>
<span class="nt"> addresses</span><span class="p">:</span><span class="w"> </span><span class="p p-Indicator">{</span><span class="nt"> underlay</span><span class="p">:</span><span class="w"> </span><span class="nv">192.168.14.12</span><span class="w"> </span><span class="p p-Indicator">},</span><span class="nt"> frr</span><span class="p">:</span><span class="w"> </span><span class="nv">frr/hv2.conf</span><span class="p p-Indicator">,</span><span class="nt"> release</span><span class="p">:</span><span class="w"> </span><span class="nv">0.2.0rc008</span><span class="p p-Indicator">,</span>
<span class="nt"> agent</span><span class="p">:</span><span class="w"> </span><span class="nv">agent/bgp.yml</span><span class="w"> </span><span class="p p-Indicator">}</span>
</pre></div>
</div>
@ -635,7 +635,7 @@ segment ;</p></li>
<li><p><code class="docutils literal notranslate"><span class="pre">frr</span></code> — le chemin d’un <code class="docutils literal notranslate"><span class="pre">frr.conf</span></code>, relatif au fichier de topologie : FRR est installé
au démarrage et la configuration déposée <strong>telle quelle</strong> (voir <a class="reference internal" href="#roles">Rôles</a>).</p></li>
<li><p><code class="docutils literal notranslate"><span class="pre">release</span></code> — <strong>obligatoire pour un hyperviseur</strong>, refusé ailleurs : le tag de la release de
two que <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code> installe (<code class="docutils literal notranslate"><span class="pre">release:</span> <span class="pre">0.2.0rc007</span></code>). Sans lui, <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code> prendrait la
two que <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code> installe (<code class="docutils literal notranslate"><span class="pre">release:</span> <span class="pre">0.2.0rc008</span></code>). Sans lui, <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code> prendrait la
dernière release, et le lab ne serait plus reproductible.</p></li>
<li><p><code class="docutils literal notranslate"><span class="pre">agent</span></code> — pour un hyperviseur seulement : le chemin d’un <code class="docutils literal notranslate"><span class="pre">agent.yml</span></code>, relatif au fichier
de topologie, déposé dans <code class="docutils literal notranslate"><span class="pre">/etc/two/agent.yml</span></code> avant <code class="docutils literal notranslate"><span class="pre">deploy.sh</span></code>. Sans lui, l’agent tourne
@ -699,8 +699,8 @@ roles
name loopback secondary frr release agent
sw1 - underlay 169.254.0.1/28 sw1.conf - -
rr1 lo1 10.255.255.1/32 underlay 169.254.0.3/28 rr1.conf - -
hv1 - - hv1.conf 0.2.0rc007 two.yml
hv2 - - hv2.conf 0.2.0rc007 bgp.yml
hv1 - - hv1.conf 0.2.0rc008 two.yml
hv2 - - hv2.conf 0.2.0rc008 bgp.yml
segment underlay: 192.168.14.0/24, mtu 9000, switch sw1, bridge br-underlay, gateway 192.168.14.1
node interface address mac udp switch port mac udp

File diff suppressed because one or more lines are too long