Merge "lib.sh: Reduce useless wget dot reporting"

[fuel.git] / mcp / config / states / dpdk

diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index eb00d72..5ae2aac 100755 (executable)
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -13,14 +13,7 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
 salt -I 'nova:compute' system.reboot
-wait_for 90 "! salt -I 'nova:compute' test.ping | " \
-  "tee /dev/stderr | grep -Fq 'Not connected'"
-salt -I 'nova:compute' state.sls linux.network
+wait_for 90.0 "salt -I 'nova:compute' test.ping"
 
-# switch to UCA repos since fuel-infra packages have bugs
-salt -I 'nova:compute' cmd.run 'rm -vrf /etc/apt/preferences.d/*'
-salt -I 'nova:compute' file.remove '/etc/apt/sources.list.d/mirantis_openstack.list'
-salt -I 'nova:compute' pkg.refresh_db
-
-salt -I 'nova:compute' pkg.install libvirt-bin
-salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm
+salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
+salt -I 'nova:compute' service.restart openvswitch-switch