-# KVM, compute node prereqs (libvirt first), VCP deployment
-salt -C 'kvm*' pkg.install bridge-utils
-salt -C 'kvm*' state.apply linux.network
-salt -C 'kvm*' system.reboot
-wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected'"
-
-salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
-
-salt -C 'kvm*' state.sls libvirt
-
-salt -C '* and not cfg01* and not mas01*' state.apply salt
-salt -C 'kvm*' saltutil.sync_all
-wait_for 10 "! salt -C 'kvm*' state.sls salt.control | " \
- "tee /dev/stderr | grep -Fq 'Not connected'"
+# Optionally destroy VCP VMs from a previous run
+if [ "${ERASE_ENV}" -eq 1 ]; then
+ kvm_vms=$(salt --out yaml 'kvm*' virt.list_domains | \
+ sed -e 's/- //g' -e 's/:.*$//g')
+ for line in ${kvm_vms}; do
+ if [[ "${line}" =~ ^kvm ]]; then
+ kvm_node=${line}
+ elif [ -n "${kvm_node}" ]; then
+ salt "${kvm_node}" virt.purge dirs=True "${line}" || true
+ fi
+ done
+fi
+
+# KVM libvirt first, VCP deployment
+wait_for 5.0 "salt -C 'kvm*' state.sls libvirt"
+
+salt -C 'kvm* or cmp*' state.apply salt
+wait_for 10.0 "salt -C 'kvm*' state.sls salt.control"