[state] Stop expecting linux.network failures

Now that the `linux.network` state applies cleanly on all nodes,
stop expecting failures to prevent false-positive passes.

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

diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index 891eae3..91a3c1e 100755 (executable)
--- 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 14581ba..e6a589e 100755 (executable)
--- 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'