diff options
| -rw-r--r-- | docs/release/NEWS.rst | 5 | ||||
| -rw-r--r-- | src/package-list.mk | 4 | ||||
| -rw-r--r-- | vswitches/ovs.py | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/docs/release/NEWS.rst b/docs/release/NEWS.rst index 4c8b80f1..5e4f0ba6 100644 --- a/docs/release/NEWS.rst +++ b/docs/release/NEWS.rst @@ -2,6 +2,11 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) OPNFV, Intel Corporation, AT&T and others. +OPNFV Colorado Release +========================= +* Support for OVS version 2.5 + DPDK 2.2. + + OPNFV Brahmaputra Release ========================= Supports both OVS and OVS with DPDK. diff --git a/src/package-list.mk b/src/package-list.mk index 4bd1159b..8b09c424 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -10,7 +10,9 @@ DPDK_TAG ?= v2.2.0 # OVS section OVS_URL ?= https://github.com/openvswitch/ovs -OVS_TAG ?= 02ab4b1a6a173979a51cabd7000a34546d517e60 +#The Tag below is for OVS v2.5.0 with backwards compatibility support for Qemu +#versions < 2.5. +OVS_TAG ?= f3ea2ad27fd076735fdb78286980749bb12fe1ce # QEMU section QEMU_URL ?= https://github.com/qemu/qemu.git diff --git a/vswitches/ovs.py b/vswitches/ovs.py index a8184320..555d7dec 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -18,6 +18,7 @@ import logging import re import os +import time import pexpect from conf import settings from vswitches.vswitch import IVSwitch @@ -65,7 +66,9 @@ class IVSwitchOvs(IVSwitch, tasks.Process): self._reset_ovsdb() self._start_ovsdb() - # DB must be up before vswitchd config is altered + # DB must be up before vswitchd config is altered or vswitchd started + time.sleep(3) + self.configure() try: |