f-87: deploy: vxlan-public sur br-public, --public_vni (1), lab au VNI 1 #87

bootstrap_kvm.sh crée vxlan-public (VTEP = IPv4 du bridge principal,
nolearning) esclave du bridge public, recréé si le VNI ou le VTEP change.
Lab : bordures au VNI 1 (MAC 02:01:00:00:00:01) ; build.sh copie
bootstrap_kvm.sh, que hypervisor.sh appelle après la release 0.2.0.

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-25 23:31:25 +01:00
commit 7535e068b9
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
10 changed files with 90 additions and 27 deletions

View file

@ -77,8 +77,8 @@ kvm_network () {
info "réseau"
# Bridge public : créé à vide, réservé pour un usage futur. Aucune adresse,
# aucun esclave, pas référencé dans la config agent.
# Bridge public : sans adresse. Il reçoit le VXLAN du segment public
# (kvm_public_segment) et les veth vp-<id>-e des VPC (interfaces.internet).
kvm_ensure_bridge "${DRY_RUN}" "${PUBLIC_BRIDGE}"
MASTER=""
@ -153,6 +153,49 @@ EOF
info " rollback désarmé"
}
# VXLAN du segment public, partagé avec les bordures, esclave du bridge public.
# VTEP = IPv4 du bridge principal, comme les VXLAN de l'agent ; sans
# apprentissage, les MAC distantes viennent d'EVPN. Recréé si le VNI ou le VTEP
# a changé.
kvm_public_segment () {
local DRY_RUN="${1}"
local WITH_NETWORK="${2}"
local BRIDGE="${3}"
local PUBLIC_BRIDGE="${4}"
local PUBLIC_VNI="${5}"
local NAME="vxlan-public"
local VTEP CURRENT=""
[[ ${WITH_NETWORK} -eq ${FLAGS_TRUE} ]] || return 0
[[ "${PUBLIC_VNI}" =~ ^[0-9]+$ ]] && (( PUBLIC_VNI >= 1 && PUBLIC_VNI <= 16777215 )) \
|| die "VNI du segment public invalide : ${PUBLIC_VNI} (1-16777215)"
info "segment public : ${NAME}, VNI ${PUBLIC_VNI}, sur ${PUBLIC_BRIDGE}"
if [[ ${DRY_RUN} -eq ${FLAGS_TRUE} ]]
then
VTEP="<ip(${BRIDGE})>"
else
VTEP=$(ip -j addr show dev "${BRIDGE}" | jq -r '[.[0].addr_info[] | select(.family=="inet" and .scope=="global")][0].local // ""')
[[ -n "${VTEP}" ]] || die "aucune adresse IPv4 globale sur ${BRIDGE} pour le VTEP du segment public"
if ip link show dev "${NAME}" >/dev/null 2>&1
then
CURRENT=$(ip -j -d link show dev "${NAME}" | jq -r '.[0].linkinfo.info_data | "\(.id) \(.local)"')
fi
fi
if [[ -n "${CURRENT}" && "${CURRENT}" != "${PUBLIC_VNI} ${VTEP}" ]]
then
info " ${NAME} porte ${CURRENT} (VNI VTEP) : recréé"
run "${DRY_RUN}" "ip link del dev '${NAME}'"
CURRENT=""
fi
[[ -n "${CURRENT}" ]] \
|| run "${DRY_RUN}" "ip link add '${NAME}' type vxlan id ${PUBLIC_VNI} local '${VTEP}' dstport 4789 nolearning"
run "${DRY_RUN}" "ip link set dev '${NAME}' mtu 1500 master '${PUBLIC_BRIDGE}'"
run "${DRY_RUN}" "ip link set up dev '${NAME}'"
}
# Point d'entrée appelé par deploy.sh --bootstrap.
bootstrap_host () {
local DRY_RUN="${1}"
@ -162,8 +205,10 @@ bootstrap_host () {
local BRIDGE="${5}"
local PUBLIC_BRIDGE="${6}"
local ROLLBACK_DELAY="${7}"
local PUBLIC_VNI="${8:-1}"
kvm_packages "${DRY_RUN}" "${WITH_PACKAGES}"
kvm_kernel "${DRY_RUN}"
kvm_network "${DRY_RUN}" "${WITH_NETWORK}" "${UPLINK}" "${BRIDGE}" "${PUBLIC_BRIDGE}" "${ROLLBACK_DELAY}"
kvm_packages "${DRY_RUN}" "${WITH_PACKAGES}"
kvm_kernel "${DRY_RUN}"
kvm_network "${DRY_RUN}" "${WITH_NETWORK}" "${UPLINK}" "${BRIDGE}" "${PUBLIC_BRIDGE}" "${ROLLBACK_DELAY}"
kvm_public_segment "${DRY_RUN}" "${WITH_NETWORK}" "${BRIDGE}" "${PUBLIC_BRIDGE}" "${PUBLIC_VNI}"
}

View file

@ -159,7 +159,7 @@ run_bootstrap () {
|| die "bootstrap_host() introuvable — ni ${SCRIPTS_DIR}/${NAME} ni ${BOOTSTRAP_URL} n'ont pu être chargés"
bootstrap_host "${DRY_RUN}" "${FLAGS_packages}" "${FLAGS_network}" \
"${FLAGS_uplink}" "${FLAGS_bridge}" "${FLAGS_pub_bridge}" "${FLAGS_rollback}"
"${FLAGS_uplink}" "${FLAGS_bridge}" "${FLAGS_pub_bridge}" "${FLAGS_rollback}" "${FLAGS_public_vni}"
}
resolve_tag () {
@ -335,7 +335,8 @@ main () {
DEFINE_boolean 'network' true 'Configure bridges during --bootstrap' 'n'
DEFINE_string 'uplink' 'eno1' 'Physical uplink interface' 'u'
DEFINE_string 'bridge' 'br-000000' 'Main bridge, uplink is enslaved to it' 'B'
DEFINE_string 'pub_bridge' 'br-public' 'Reserved empty bridge' 'P'
DEFINE_string 'pub_bridge' 'br-public' 'Public bridge, carries vxlan-public' 'P'
DEFINE_integer 'public_vni' 1 'VNI of the public segment (vxlan-public)' 'N'
DEFINE_integer 'rollback' 120 'Rollback reboot delay in seconds' 'R'
DEFINE_boolean 'verify' true 'Check assets against SHA256SUMS' 'V'