diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 21:53:47 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 23:48:02 +0000 |
| commit | cdd1937d1179b76dd55af7c26a3e14ed451848f3 (patch) | |
| tree | 6a7a08abd92df23d13438a78758a859ab8f35498 /mcp | |
| parent | 2c4241c3d04ac1e5f43c701e776ae37684681e63 (diff) | |
[baremetal] Fix DPDK by running linux.system first
DPDK scenario requires hugepages to be set up and enabled before
configuring OVS ports, so apply `linux.system` on compute nodes
and reboot them before attempting to run `linux.network` state.
Change-Id: I2b685361b07727a4740a3676c5f219a6443d1cf2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 64920b8bb1e95389146451598221f2c7eb97f5e3)
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 58ae33506..ec8fc9c15 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -13,8 +13,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 |