diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 16:19:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-18 16:19:36 +0000 |
| commit | 2190992952ccc7987f4fbcaf856340ce1ca69c1f (patch) | |
| tree | dd7fb5023a3333ba7124c7815f890de58492ecfc | |
| parent | 0d7c1243405a58ecf3d0a85fcedecfbce6a626cd (diff) | |
| parent | cdd1937d1179b76dd55af7c26a3e14ed451848f3 (diff) | |
Merge "[baremetal] Fix DPDK by running linux.system first" into stable/euphrates
| -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 |