diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 23:47:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-16 23:47:50 +0000 |
| commit | 7a1337aeaee3e34ae5c21bb2e9798232f3b2ca28 (patch) | |
| tree | 1ee4996aef007acdbb725d610f2c79791d4f7fea /mcp | |
| parent | 30c3ae2ed15004ae013c56980138a1678d83922d (diff) | |
| parent | 64920b8bb1e95389146451598221f2c7eb97f5e3 (diff) | |
Merge "[baremetal] Fix DPDK by running linux.system first"
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 a0e3a31d0..909439134 100755 --- 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 |