diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-11 14:36:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-11 14:36:54 +0000 |
| commit | 81dad2be6c0851bea9a06841a26ea26ea3c7a82f (patch) | |
| tree | c49591b0dfe9e0aa005dc2cfb80e2cffbb28d888 /mcp | |
| parent | 79e32c8cc5631204d2e5b0b328c954a2a2197037 (diff) | |
| parent | e47bff27a1ce085dc27d25059eb408a49b811eb9 (diff) | |
Merge "[state] Stop expecting linux.network failures"
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/baremetal_init | 4 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index 891eae365..91a3c1ec0 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -22,13 +22,13 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ pattern="^\s{8}__salt__\['pkg.install'\]\('vlan'\)" \ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')" -salt -C 'kvm*' pkg.install bridge-utils +salt -C 'kvm* or cmp*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network,linux.system.kernel salt -C 'kvm* or cmp*' state.apply salt.minion wait_for 5.0 "salt -C 'cmp*' state.apply linux.system" # wrap distro `route` binary to silence errors when route already exists wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper" -salt -C 'cmp*' state.apply linux.network || true +wait_for 5.0 "salt -C 'cmp*' state.apply linux.network" wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" # disable dhcp offered routes on compute nodes diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 14581bacb..e6a589e62 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -113,7 +113,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.apply salt' wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage' - wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' || true + wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' salt -C "E@^(${NODE_MASK}).*" state.sls opnfv.route_wrapper salt -C "E@^(${NODE_MASK}).*" system.reboot wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping' |