Updated from global requirements

Change-Id: Ie59dd20ed5a369b86c9ae7ad160f2ef8ef04b6c6

requirements.txt

@@ -7,9 +7,9 @@ oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.2.0 # Apache-2.0
 oslo.concurrency>=2.3.0 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0
-enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
+enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
 
-eventlet>=0.17.4
-six>=1.9.0
+eventlet>=0.17.4 # MIT
+six>=1.9.0 # MIT
 
-jsonschema!=2.5.0,<3.0.0,>=2.0.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT

setup.cfg

@@ -55,16 +55,16 @@ oslo.config.opts =
 [extras]
 # Dependencies for each of the optional stores
 s3 =
-  boto>=2.32.1
+  boto>=2.32.1 # MIT
 vmware =
   oslo.vmware>=1.16.0 # Apache-2.0
 swift =
-  httplib2>=0.7.5
-  python-swiftclient>=2.2.0
+  httplib2>=0.7.5 # MIT
+  python-swiftclient>=2.2.0 # Apache-2.0
 gridfs =
-  pymongo>=3.0.2
+  pymongo>=3.0.2 # Apache-2.0
 cinder =
-  python-cinderclient>=1.3.1
+  python-cinderclient>=1.3.1 # Apache-2.0
 
 [build_sphinx]
 source-dir = doc/source

test-requirements.txt

@@ -5,19 +5,19 @@
 hacking<0.11,>=0.10.0
 
 # Packaging
-mock>=1.2
+mock>=1.2 # BSD
 
 # Unit testing
-coverage>=3.6
-fixtures>=1.3.1
-python-subunit>=0.0.18
+coverage>=3.6 # Apache-2.0
+fixtures>=1.3.1 # Apache-2.0/BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=0.7.0 # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
 
 # this is required for the docs build jobs
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 reno>=0.1.1 # Apache2