Merge "[baremetal] Fix DPDK by running linux.system first"

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index a0e3a31..9094391 100755 (executable)
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -15,8 +15,10 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 # 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 'cmp*' state.apply linux.system
+salt -C 'kvm* or cmp*' system.reboot
+wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+  "tee /dev/stderr | grep -Fq 'Not connected'"
 
 salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp