diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-19 05:34:28 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-19 03:39:46 +0000 |
| commit | 36c6f5a54806a4ab21f33d24256c558dc65a4157 (patch) | |
| tree | 2054480ffcbd19cd7712ba21117677980947e7af | |
| parent | 10eee9bbe2f39e94578f1017885b7bb630d0fa30 (diff) | |
[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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 595119281c50edb86b987f5fdd6eac25e28147ae)
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 1 |
1 files changed, 1 insertions, 0 deletions
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'" |