From 327d657cb7c935b2dc04562b4295496f2fe6cd50 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 28 Sep 2016 21:50:39 -0400
Subject: [PATCH] Update ovs to 2.6.0.

OVS 2.6.0 was just released.  This version includes support for
Python 3.  Now that it is officially released, I think we should only
depend on 2.6.0 and up.

Change-Id: I669ec72743a61b0908c461ff0ec3340f8683a6ec
Signed-off-by: Russell Bryant <rbryant@redhat.com>
---
 global-requirements.txt | 3 +--
 upper-constraints.txt   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/global-requirements.txt b/global-requirements.txt
index 3adbccb67e..60c4d6f829 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -131,8 +131,7 @@ os-collect-config  # Apache-2.0
 os-refresh-config  # Apache-2.0
 os-testr>=0.7.0  # Apache-2.0
 os-vif>=1.1.0                           # Apache-2.0
-ovs>=2.5.0;python_version=='2.7'        # Apache-2.0
-ovs>=2.6.0.dev3;python_version>='3.4'   # Apache-2.0
+ovs>=2.6.0                              # Apache-2.0
 os-win>=0.2.3                           # Apache-2.0
 paramiko>=2.0 # LGPLv2.1+
 Parsley  # MIT
diff --git a/upper-constraints.txt b/upper-constraints.txt
index d4f61e3fb9..44be4e1f78 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -233,8 +233,7 @@ oslo.vmware===2.14.0
 oslosphinx===4.7.0
 oslotest===2.10.0
 osprofiler===1.4.0
-ovs===2.5.0;python_version=='2.7'
-ovs===2.6.0.dev3;python_version=='3.4' or python_version=='3.5'
+ovs===2.6.0
 packaging===16.7
 paramiko===2.0.2
 passlib===1.6.5