diff --git a/README.md b/README.md index bf5c5ba..2efb3a4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ fournisseur), et une image se reconstruit à la demande plutôt que de se télé | Image | Source | Personnalisation | |-------|--------|------------------| -| `rocky10` | Rocky Linux 10.2 GenericCloud Base `20260525.0` (SHA-256 signée par Rocky) | exigences two + `docs/deploiement/image-qcow2.rst` (sshd, utilisateur `syonad`, SELinux désactivé…), chrony sur les seuls serveurs NTP du DHCP | +| `rocky10` | Rocky Linux 10.2 GenericCloud Base `20260525.0` (SHA-256 signée par Rocky) | exigences two + `docs/deploiement/image-qcow2.rst` (sshd, utilisateur `syonad`, SELinux désactivé…), chrony sur les seuls serveurs NTP du DHCP, correctif cloud-init (profils NetworkManager nommés par interface) | | `debian13` | Debian 13 genericcloud `20261021-2638` (SHA-512) | exigences two | Exigences two, communes : source de métadonnées NoCloud vers `169.254.169.254`, `network-config` @@ -30,7 +30,9 @@ système de fichiers, premier Mio nul). ``` ./build.sh check formatage, validation des templates, shellcheck ./build.sh construit dist/.qcow2 et met à jour dist/SHA512SUMS -./test.sh démarre l'image (seed NoCloud, 2 interfaces, 1 disque xvdb) et la vérifie +./test.sh démarre l'image (seed NoCloud avec network-config au format de two, + 3 interfaces dont 2 décrites, 1 disque xvdb) et la vérifie, + avant et après redémarrage ``` Prérequis : `qemu-system-x86_64`, `qemu-img`, `curl`, `unzip`, `ssh-keygen`, `shellcheck` (pour diff --git a/packer/scripts/check.sh b/packer/scripts/check.sh index e91b5bf..ab03552 100644 --- a/packer/scripts/check.sh +++ b/packer/scripts/check.sh @@ -40,6 +40,12 @@ no_fixed_ntp () { ! grep -qE '^[[:space:]]*(pool|server|peer)[[:space:]]' /mnt/etc/chrony.conf } +nm_files_by_device () { + local dir + dir=$(chroot /mnt python3 -c 'import cloudinit, os; print(os.path.dirname(cloudinit.__file__))') || return 1 + has_line "/mnt${dir}/net/network_manager.py" ' name = nm_conn_filename(iface["name"], target)' +} + check "/var/lib/cloud vide" empty_or_absent /mnt/var/lib/cloud check "aucune clé d'hôte SSH" no_match /mnt/etc/ssh -maxdepth 1 -name 'ssh_host_*' check "aucun authorized_keys sous /root" no_match /mnt/root -name authorized_keys @@ -60,6 +66,7 @@ case "${FAMILY}" in check "utilisateur par défaut syonad" has_line /mnt/etc/cloud/cloud.cfg.d/20_user.cfg " name: syonad" check "chrony sans serveur NTP fixe" no_fixed_ntp check "chrony sur les serveurs NTP du DHCP" has_line /mnt/etc/chrony.conf "sourcedir /run/chrony-dhcp" + check "profils NetworkManager de cloud-init nommés par interface" nm_files_by_device ;; esac diff --git a/packer/scripts/rocky.sh b/packer/scripts/rocky.sh index 0be7ca3..11dddf8 100644 --- a/packer/scripts/rocky.sh +++ b/packer/scripts/rocky.sh @@ -53,6 +53,28 @@ for unit in rpcbind.service rpcbind.socket; do fi done +CLOUDINIT=$(chroot /mnt python3 -c 'import cloudinit, os; print(os.path.dirname(cloudinit.__file__))') +[ -n "${CLOUDINIT}" ] || die "module cloudinit introuvable dans la cible" +patch -d "/mnt${CLOUDINIT}" -p1 --forward --fuzz=0 --no-backup-if-mismatch <<'EOF' +--- a/net/network_manager.py ++++ b/net/network_manager.py +@@ -594,10 +594,11 @@ + conn.render_interface(iface, network_state, self) + + # And finally write the files +- for con_id, conn in self.connections.items(): ++ for iface in network_state.iter_interfaces(): ++ conn = self.connections[iface.get("config_id") or iface["name"]] + if not conn.valid(): + continue +- name = nm_conn_filename(con_id, target) ++ name = nm_conn_filename(iface["name"], target) + util.write_file(name, conn.dump(), 0o600) + + # Select EUI64 to be used by default by NM for creating the address +EOF +chroot /mnt python3 -m py_compile "${CLOUDINIT}/net/network_manager.py" + augtool -r /mnt -s set /files/etc/selinux/config/SELINUX disabled augtool -r /mnt -s rm /files/etc/chrony.conf/pool diff --git a/packer/scripts/target.sh b/packer/scripts/target.sh index 1563b8c..cf8ad37 100644 --- a/packer/scripts/target.sh +++ b/packer/scripts/target.sh @@ -23,7 +23,7 @@ wait_cloud_init () { install_tools () { case "${FAMILY}" in - rocky) dnf -y -q install qemu-img augeas xfsprogs ;; + rocky) dnf -y -q install qemu-img augeas xfsprogs patch ;; debian) DEBIAN_FRONTEND=noninteractive apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y --no-install-recommends qemu-utils e2fsprogs ;; esac diff --git a/test.sh b/test.sh index 3be425d..2a4d0b4 100755 --- a/test.sh +++ b/test.sh @@ -9,6 +9,9 @@ QEMU_PID="" FAILED=0 KEEP=0 +MAC0=52:54:00:00:00:01 +MAC1=52:54:00:00:00:02 +MAC2=52:54:00:00:00:03 die () { KEEP=1; echo "!! ${1}" >&2; exit 1; } @@ -26,7 +29,8 @@ cleanup () { fi [ -n "${RUN}" ] || return 0 rm -f "${RUN:?}/key" "${RUN:?}/key.pub" "${RUN:?}/root.qcow2" "${RUN:?}/data.qcow2" \ - "${RUN:?}/seed/meta-data" "${RUN:?}/seed/user-data" "${RUN:?}/seed/vendor-data" + "${RUN:?}/seed/meta-data" "${RUN:?}/seed/user-data" "${RUN:?}/seed/vendor-data" \ + "${RUN:?}/seed/network-config" rmdir "${RUN}/seed" if [ "${KEEP}" -eq 1 ]; then echo "!! console conservée : ${RUN}/console.log" >&2 @@ -108,18 +112,19 @@ boot () { -drive "file=${RUN}/data.qcow2,format=qcow2,if=none,id=data" \ -device scsi-hd,drive=data,bus=scsi0.0,serial=xvdb \ -netdev "user,id=n0,net=169.254.169.0/24,hostfwd=tcp:127.0.0.1:${PORT}-:22,guestfwd=tcp:169.254.169.254:80-cmd:python3 -I ${ROOT}/metadata.py ${RUN}/seed" \ - -device virtio-net-pci,netdev=n0 \ - -netdev user,id=n1,net=10.0.3.0/24 -device virtio-net-pci,netdev=n1 & + -device "virtio-net-pci,netdev=n0,mac=${MAC0}" \ + -netdev user,id=n1,net=10.0.3.0/24 -device "virtio-net-pci,netdev=n1,mac=${MAC1}" \ + -netdev user,id=n2,net=10.0.4.0/24 -device "virtio-net-pci,netdev=n2,mac=${MAC2}" & QEMU_PID=$! } -two_leases () { - [ "$(vm "ip -4 -o addr show | awk '\$2 ~ /^en/ { print \$2 }' | sort -u | wc -l")" -ge 2 ] +three_leases () { + [ "$(vm "ip -4 -o addr show | awk '\$2 ~ /^en/ { print \$2 }' | sort -u | wc -l")" -ge 3 ] } -second_nic_by_two () { +nic_without_config_by_two () { local nic - nic=$(vm "ip -o link show | awk -F': ' '\$2 ~ /^en/ { print \$2 }' | sort | sed -n 2p") + nic=$(vm "ip -br link show | awk '\$3 == \"${MAC2}\" { print \$1 }'") [ -n "${nic}" ] || return 1 if vm 'command -v nmcli' >/dev/null; then [ "$(vm "nmcli -g GENERAL.CONNECTION device show ${nic}")" = two-all-en ] @@ -150,6 +155,8 @@ printf 'instance-id: two-images-test\nlocal-hostname: two-images-test\n' > "${RU printf '#cloud-config\nusers:\n - name: syonad\n shell: /bin/bash\n sudo: "ALL=(ALL) NOPASSWD:ALL"\n ssh_authorized_keys:\n - %s\n' \ "$(cat "${RUN}/key.pub")" > "${RUN}/seed/user-data" : > "${RUN}/seed/vendor-data" +printf 'version: 2\nethernets:\n eth0:\n match:\n macaddress: "%s"\n dhcp4: true\n eth1:\n match:\n macaddress: "%s"\n dhcp4: true\n' \ + "${MAC0}" "${MAC1}" > "${RUN}/seed/network-config" qemu-img create -q -f qcow2 -b "${DIST}/${image}.qcow2" -F qcow2 "${RUN}/root.qcow2" qemu-img create -q -f qcow2 "${RUN}/data.qcow2" 1G @@ -157,8 +164,8 @@ boot wait_ssh check "cloud-init terminé sans erreur" cloud_init_done check "nom d'hôte servi par 169.254.169.254" test "$(vm hostname)" = two-images-test -check "bail DHCP sur les deux interfaces" two_leases -check "seconde interface configurée par le fichier de two" second_nic_by_two +check "bail DHCP sur les trois interfaces" three_leases +check "interface absente du network-config configurée par le fichier de two" nic_without_config_by_two check "disque additionnel en /dev/xvdb" vm 'test -b /dev/xvdb' check "aucune clé de construction" vm '! sudo grep -rq two-images-build /home /root /etc/ssh' if vm 'command -v getenforce' >/dev/null; then @@ -170,7 +177,8 @@ fi BOOT=$(boot_id) vm_closing 'sudo systemctl reboot' wait_reboot "${BOOT}" -check "bail DHCP sur les deux interfaces après redémarrage" two_leases +check "cloud-init terminé sans erreur après redémarrage" cloud_init_done +check "bail DHCP sur les trois interfaces après redémarrage" three_leases check "disque additionnel en /dev/xvdb après redémarrage" vm 'test -b /dev/xvdb' vm_closing 'sudo systemctl poweroff' wait_exit