From 36c6f5a54806a4ab21f33d24256c558dc65a4157 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 19 Oct 2017 05:34:28 +0200 Subject: [baremetal] cmp: run linux.network before reboot The recent addition of `linux.system`, combined with `system.reboot` for the baremetal compute nodes leaves compute nodes unconfigured after reboot. Run `system.network` too, but expect a failure (only for DPDK, which requires hugepages to be already active, hence a prior reboot). Fixes: 64920b8 Change-Id: I8c73b24ae15e1f87dee64ae2aba7af86db1e942f Signed-off-by: Alexandru Avadanii (cherry picked from commit 595119281c50edb86b987f5fdd6eac25e28147ae) --- mcp/config/states/virtual_control_plane | 1 + 1 file changed, 1 insertion(+) (limited to 'mcp') diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 909439134..0c3ef59f4 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -16,6 +16,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system +salt -C 'cmp*' state.apply linux.network || true salt -C 'kvm* or cmp*' system.reboot wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ "tee /dev/stderr | grep -Fq 'Not connected'" -- cgit 1.2.3-korg