Skip to content

Commit

Permalink
Reboots logging VMs during install
Browse files Browse the repository at this point in the history
A side-effect of consolidating the log collection logic is that all VMs,
even the TemplateVM for sd-log, begins shipping logs immediately upon
configuration. That's a problem for sd-log AppVM & TemplateVM because
the RPC calls to send logs will cause the AppVM to boot. If the AppVM
doesn't have the final config from the TemplateVM, because of an early
boot, log aggregation won't work. Let's configure both the TemplateVM &
AppVM, then shut down the TemplateVM (automatic as part of salt disp
mgmt vm logic), then reboot the AppVM. All tests passing on a clean
install.
  • Loading branch information
Conor Schaefer committed Mar 10, 2020
1 parent e73aceb commit adc6dd4
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions scripts/provision-all
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ sudo qubesctl --show-output --skip-dom0 --targets sys-firewall state.sls sd-sys-
echo "Set up dom0 config files, including RPC policies, and create VMs"
sudo qubesctl --show-output state.highstate

echo "Setup sd-log-buster-template vm first"
sudo qubesctl --show-output --skip-dom0 --targets sd-log-buster-template state.highstate
echo "Set up logging VMs early"
sudo qubesctl --show-output --skip-dom0 --targets sd-log,sd-log-buster-template state.highstate
# Reboot sd-log so it's ready to receive logs from other VMs about to be configured
qvm-shutdown --wait sd-log && qvm-start sd-log
# Provision whonix-gw-15 with log additions because it isn't tagged with sd-workstation (we don't want it removed after a make clean)
sudo qubesctl --show-output --skip-dom0 --targets whonix-gw-15 state.highstate
#sudo qubesctl --show-output --skip-dom0 --targets whonix-gw-15 state.sls sd-whonix-template-files
qvm-shutdown --wait whonix-gw-15

# Format list of all VMs comma-separated, for use as qubesctl target
Expand Down

0 comments on commit adc6dd4

Please sign in to comment.