airship
/
promenade
Code Issues Proposed changes

Fix: incorrect handling of virt-host-validate 

This avoids handling a warning as an error and fixes an incorrect call
to `virt-host-health`.

Change-Id: I3bb1dda6025966c393b82780ee8d9e914973756b
This commit is contained in:
Mark Burnett 2017-10-26 11:43:57 -05:00
parent b9c17f34dc
commit fe6f26b776
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/g2/lib/log.sh
View File

@ -34,7 +34,7 @@ log_huge_success() {
}
log_note() {
echo -e {$C_HILIGHT}NOTE:${C_CLEAR} ${@}
echo -e ${C_HILIGHT}NOTE:${C_CLEAR} ${@}
}
log_stage_error() {

8
tools/setup_gate.sh
View File

@ -41,16 +41,18 @@ if [ "xY" != "x$(cat /sys/module/kvm_intel/parameters/nested)" ]; then
fi
if ! sudo virt-host-validate qemu &> /dev/null; then
log_note Host did not validate virtualization check:
sudo virt-host-validate qemu || true
if ! grep intel_iommu /etc/defaults/grub &> /dev/null; then
log_note Enabling Intel IOMMU
REQUIRE_REBOOT=1
sudo mkdir -p /etc/defaults
sudo touch /etc/defaults/grub
echo 'GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} intel_iommu=on"' | sudo tee -a /etc/defaults/grub
sudo update-grub
else
echo -e ${C_ERROR}Failed to configure virtualization:${C_CLEAR}
sudo virt-host-health qemu
exit 1
log Intel IOMMU appears enabled in grub configuration already
fi
fi