parallelvirtualcluster/pvc-installer
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: parallelvirtualcluster:b5d1d75650d2a0f6eb8419ff80aa1abd72c67703
Branches Tags
parallelvirtualcluster:master
...
compare: parallelvirtualcluster:7e04199e1eec52f5092835bd2d9a224faf6fc353
Branches Tags
parallelvirtualcluster:master

2 Commits
b5d1d75650 ... 7e04199e1e

Author SHA1 Message Date
Joshua Boniface
7e04199e1e Update default mirror to UWaterloo (Rogers outage) 2022-07-08 15:31:17 -04:00
Joshua Boniface
cb0ab9e63c Remove extra final phase of boot checks 2022-07-08 15:19:21 -04:00
2 changed files with 6 additions and 9 deletions
Show Stats Expand all files Collapse all files

4
buildiso.sh
View File

@ -29,7 +29,7 @@ show_help() {
echo -e " -o: Create the ISO as <output_filename> instead of the default." echo -e " -o: Create the ISO as <output_filename> instead of the default."
echo -e " -u: Change 'deploy' user to a new username." echo -e " -u: Change 'deploy' user to a new username."
echo -e " -c: Change CPU architecture to a new architecture [x86_64/aarch64]." echo -e " -c: Change CPU architecture to a new architecture [x86_64/aarch64]."
echo -e " -m: Change the mirror server (default 'https://debian.mirror.rafal.ca')." echo -e " -m: Change the mirror server (default 'https://mirror.csclub.uwaterloo.ca')."
echo -e " -a: Preserve live-build artifacts." echo -e " -a: Preserve live-build artifacts."
echo -e " -k: Preserve live-build config." echo -e " -k: Preserve live-build config."
} }
@ -101,7 +101,7 @@ if [[ -z ${deployusername} ]]; then
deployusername="deploy" deployusername="deploy"
fi fi
if [[ -z ${mirror_server} ]]; then if [[ -z ${mirror_server} ]]; then
mirror_server="https://debian.mirror.rafal.ca" mirror_server="https://mirror.csclub.uwaterloo.ca"
fi fi
mkdir -p artifacts/lb mkdir -p artifacts/lb

11
templates/install.sh
View File

@ -73,7 +73,7 @@ default_filesystem="ext4"
supported_debrelease="buster bullseye" supported_debrelease="buster bullseye"
default_debrelease="buster" default_debrelease="buster"
default_debmirror="http://debian.mirror.rafal.ca/debian" default_debmirror="http://mirror.csclub.uwaterloo.ca/debian"
# Base packages (installed by debootstrap) # Base packages (installed by debootstrap)
basepkglist="lvm2,parted,gdisk,sudo,vim,gpg,gpg-agent,openssh-server,vlan,ifenslave,python3,ca-certificates,curl" basepkglist="lvm2,parted,gdisk,sudo,vim,gpg,gpg-agent,openssh-server,vlan,ifenslave,python3,ca-certificates,curl"
@ -863,11 +863,8 @@ host_ipaddr=\$( ip -br address show \${target_interface} | awk '{ print \$3 }' |
bmc_macaddr=\$( ipmitool lan print | grep 'MAC Address ' | awk '{ print \$NF }' ) bmc_macaddr=\$( ipmitool lan print | grep 'MAC Address ' | awk '{ print \$NF }' )
bmc_ipaddr=\$( ipmitool lan print | grep 'IP Address ' | awk '{ print \$NF }' ) bmc_ipaddr=\$( ipmitool lan print | grep 'IP Address ' | awk '{ print \$NF }' )
if [[ -f /etc/pvc-install.hooks ]]; then if [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then
# The third boot, when all hooks have been completed # The second boot, after Ansible has configured the cluster
action="system-boot_completed"
elif [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then
# The second boot, when Ansible has configured the cluster
action="system-boot_configured" action="system-boot_configured"
else else
# The first boot, when Ansible has not been run yet # The first boot, when Ansible has not been run yet
@ -881,7 +878,7 @@ curl -X POST \
-d "{\"action\":\"\${action}\",\"hostname\":\"\$( hostname -s )\",\"host_macaddr\":\"\${host_macaddr}\",\"host_ipaddr\":\"\${host_ipaddr}\",\"bmc_macaddr\":\"\${bmc_macaddr}\",\"bmc_ipaddr\":\"\${bmc_ipaddr}\"}" \ -d "{\"action\":\"\${action}\",\"hostname\":\"\$( hostname -s )\",\"host_macaddr\":\"\${host_macaddr}\",\"host_ipaddr\":\"\${host_ipaddr}\",\"bmc_macaddr\":\"\${bmc_macaddr}\",\"bmc_ipaddr\":\"\${bmc_ipaddr}\"}" \
\${pvcbootstrapd_checkin_uri} \${pvcbootstrapd_checkin_uri}
if [[ \${action} == "system-boot_completed" ]]; then if [[ \${action} == "system-boot_configured" ]]; then
# Clean up the bootstrap interface and this script # Clean up the bootstrap interface and this script
rm /etc/network/interfaces.d/\${target_interface} rm /etc/network/interfaces.d/\${target_interface}
rm \$0 rm \$0