Skip to content
Snippets Groups Projects
Verified Commit d8a7ca89 authored by Antoine R. Dumont's avatar Antoine R. Dumont
Browse files

build_iso.sh: Allow PRESEED_INTERFACE{0,1} to be defined in the yaml

It was not working for the old beaubourg machine whose interfaces named
differed.

Refs. sysadm-environment#5250
parent 22c666cd
No related branches found
No related tags found
1 merge request!2Add config for rancher-node-staging-rke2-metal01
......@@ -43,7 +43,15 @@ CRYPTED_PASSWORD="$(echo "${PASSWORD}" | mkpasswd -s)"
PRESEED_FILE="${BASEDIR}/configs/preseeding/${HOSTNAME}.txt"
env CRYPTED_PASSWORD=$CRYPTED_PASSWORD j2 -f yaml -e env "${BASEDIR}/configs/preseeding/preseed.txt.j2" "${CONFIG}" >"${PRESEED_FILE}"
# If not provided in the hostname configuration, fallback to the default interface
sed -i s'/{{PRESEED_INTERFACE0}}/ens10f0np0/g' "${PRESEED_FILE}"
sed -i s'/{{PRESEED_INTERFACE1}}/ens10f0np1/g' "${PRESEED_FILE}"
FINISH_INSTALL="${BASEDIR}/configs/preseeding/finish_install/${HOSTNAME}.sh"
j2 -f yaml -e env "${BASEDIR}/configs/preseeding/finish_install/finish_install.sh.j2" "${CONFIG}" >"${FINISH_INSTALL}"
# If not provided in the hostname configuration, fallback to the default interface
sed -i s'/{{PRESEED_INTERFACE0}}/ens10f0np0/g' "${FINISH_INSTALL}"
sed -i s'/{{PRESEED_INTERFACE1}}/ens10f0np1/g' "${FINISH_INSTALL}"
echo "Generated preseeding config in ${PRESEED_FILE} and ${FINISH_INSTALL}." 1>&2
......@@ -3,8 +3,8 @@ set -e
cat >/etc/systemd/network/bond0-interfaces.network <<EOF
[Match]
Name=ens10f0np0
Name=ens10f1np1
Name={{PRESEED_INTERFACE0}}
Name={{PRESEED_INTERFACE1}}
[Network]
Bond=bond0
......
......@@ -369,10 +369,10 @@ d-i finish-install/reboot_in_progress note
d-i preseed/early_command string \
anna-install net-modules-`uname -r` && \
modprobe bonding mode=802.3ad miimon=100 lacp_rate=slow xmit_hash_policy=layer3+4 && \
ip l set ens10f0np0 master bond0 && \
ip l set ens10f1np1 master bond0 && \
ip l set {{PRESEED_INTERFACE0}} master bond0 && \
ip l set {{PRESEED_INTERFACE1}} master bond0 && \
ip l add link bond0 name vlan{{VLAN_ID}} type vlan id {{VLAN_ID}} && \
for iface in ens10f0np0 ens10f1np1 bond0 vlan{{VLAN_ID}}; do ip l set $iface up; done && \
for iface in {{PRESEED_INTERFACE0}} {{PRESEED_INTERFACE1}} bond0 vlan{{VLAN_ID}}; do ip l set $iface up; done && \
ip a add dev vlan{{VLAN_ID}} {{IPADDRESS}}/{{NETMASK}} && \
ip r add default via {{GATEWAY}} && \
echo {{HOSTNAME}} > /etc/hostname && \
......
......@@ -10,6 +10,9 @@ DEPLOYMENT: staging
SUBNET: sesi_rocquencourt_staging
BOOT_DISK_ID_PATTERN: "wwn-0x61866da0734677001fbdcb6b0f36a29c"
IPXE_NET: net8
PRESEED_INTERFACE0: enp12s0f0
PRESEED_INTERFACE1: enp12s0f1
# 1 raid virtual disk (and no boot controller disk)
# PARTMAN_METHOD: raid
# RAID_DISKS:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment