X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fdpdk;h=5ae2aac48886a829d92d8da383375ed30c555bdf;hb=8bb7aa853357117649441946ed1553d907b37871;hp=c6cd2a5a81fde4458333b296ffb8f0567ed98ba5;hpb=0f3fc04189db6156dd3a6d85c834f94b1d0c69aa;p=fuel.git

diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index c6cd2a5a8..5ae2aac48 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -1,9 +1,19 @@
-#!/bin/bash
-set -x
+#!/bin/bash -e
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
+# shellcheck disable=SC1090
+source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
 salt -I 'nova:compute' system.reboot
-while true; do salt -I 'nova:compute' test.ping | fgrep -q 'Not connected' || break; done
-salt -I 'nova:compute' state.sls linux.network.dpdk
+wait_for 90.0 "salt -I 'nova:compute' test.ping"
 
-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