summaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-04 09:46:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-04 09:46:19 +0000
commit81ee9b180ab11507492783aa1d62927faa9876df (patch)
treee42d033be541ad145f2c219bca35fb4946a403fa /mcp/config/states
parenta384976c68f07017bca993cdbe578061ec539890 (diff)
parent109b2b7951ee8aab7bc9d58c9fb3aec99110cf33 (diff)
Merge "[virtual] Update dpdk scenario with pike"
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/dpdk7
1 files changed, 2 insertions, 5 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index eb00d7279..6aa2b488c 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -15,12 +15,9 @@ 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
-# 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' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
+salt -I 'nova:compute' service.restart openvswitch-switch
salt -I 'nova:compute' pkg.install libvirt-bin
salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm