Merge "Add 'ovs' to requirements.txt"

diff --cc requirements.txt
index e07889d667e37eef0440e9c7e9bfecd487857d6b,78f062adc06a44629a14f518f7ef0656409242dd..a51c6d5985f4d1152159c4bfb8611766eaf82ac7
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -26,19 -26,19 +26,20 @@@ alembic>=0.8.
  six>=1.9.0
  stevedore>=1.5.0 # Apache-2.0
  oslo.concurrency>=2.3.0 # Apache-2.0
 -oslo.config>=2.7.0 # Apache-2.0
 +oslo.config>=3.2.0 # Apache-2.0
  oslo.context>=0.2.0 # Apache-2.0
 -oslo.db>=3.2.0 # Apache-2.0
 +oslo.db>=4.1.0 # Apache-2.0
  oslo.i18n>=1.5.0 # Apache-2.0
 -oslo.log>=1.12.0 # Apache-2.0
 -oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0
 +oslo.log>=1.14.0 # Apache-2.0
 +oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0
  oslo.middleware>=3.0.0 # Apache-2.0
  oslo.policy>=0.5.0 # Apache-2.0
 +oslo.reports>=0.6.0 # Apache-2.0
  oslo.rootwrap>=2.0.0 # Apache-2.0
  oslo.serialization>=1.10.0 # Apache-2.0
 -oslo.service>=0.12.0 # Apache-2.0
 -oslo.utils>=2.8.0 # Apache-2.0
 +oslo.service>=1.0.0 # Apache-2.0
 +oslo.utils>=3.2.0 # Apache-2.0
  oslo.versionedobjects>=0.13.0
+ ovs>=2.4.0;python_version=='2.7'        # Apache-2.0
  
  python-novaclient!=2.33.0,>=2.29.0