diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-07 14:52:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-07 14:52:46 +0000 |
| commit | 20dac8e3fd7e3a4161b0ee0ea4f5eb4833a99dda (patch) | |
| tree | a1aaac388ce04bff363f8fd2182dbc440460bc90 /mcp/scripts/salt.sh | |
| parent | 854729dd3174985f524c2a2ab9d373b65f49d188 (diff) | |
| parent | f49be97051c3c5c8bb4386d236197103d3682720 (diff) | |
Merge "Add NOVCP HA OVS scenario (baremetal, virtual)"
Diffstat (limited to 'mcp/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 15168c0cc..824cada7b 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -106,10 +106,10 @@ 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' - salt -C "E@^(${NODE_MASK}).*" state.sls linux.network -b 1 || true + wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' || true salt -C "E@^(${NODE_MASK}).*" system.reboot wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping' - wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" pkg.upgrade refresh=False' + wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" pkg.upgrade refresh=False dist_upgrade=True' wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.sls ntp' |