Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[bgpvpn] Use Linux bridge for odl01 public network"
[fuel.git]
/
mcp
/
config
/
states
/
dpdk
diff --git
a/mcp/config/states/dpdk
b/mcp/config/states/dpdk
index
6aa2b48
..
65832db
100755
(executable)
--- a/
mcp/config/states/dpdk
+++ b/
mcp/config/states/dpdk
@@
-12,12
+12,8
@@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
# shellcheck disable=SC1090
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' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
salt -I 'nova:compute' service.restart openvswitch-switch
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
+# Set datapath type to netdev for public bridge
+salt -I 'nova:compute'
cmd.run 'ovs-vsctl br-exists br-floating && ovs-vsctl set bridge br-floating datapath_type=netdev' ignore_retcode=True