[ha] Retry salt.minion state apply

Baremental compute nodes time out with 'Not connected' or
'No response' while trying to apply `salt.minion` highstate after
the Salt 2017.7 bump, retry applying it up to 5 times.

Change-Id: I67f74c65a7cebe0a0b4c2812fa0ced6c1144be58
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index 91a3c1e..c023338 100755 (executable)
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -24,7 +24,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
 
 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 '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"