Updated from global requirements

Change-Id: I123dcebeb444e0d9a98067055f972ea60ed8528e

requirements.txt

@@ -1,12 +1,12 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-alembic>=0.8.0
-Babel>=1.3
-cffi
-cryptography>=1.0 # Apache-2.0
-eventlet>=0.17.4
-jsonschema!=2.5.0,<3.0.0,>=2.0.0
+alembic>=0.8.0 # MIT
+Babel>=1.3 # BSD
+cffi # MIT
+cryptography>=1.0 # BSD/Apache-2.0
+eventlet>=0.17.4 # MIT
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
 oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
@@ -16,16 +16,16 @@ oslo.log>=1.14.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
-Paste
-PasteDeploy>=1.5.0
-pbr>=1.6
-pecan>=1.0.0
-pycrypto>=2.6
-pyOpenSSL>=0.14
+oslo.utils>=3.4.0 # Apache-2.0
+Paste # MIT
+PasteDeploy>=1.5.0 # MIT
+pbr>=1.6 # Apache-2.0
+pecan>=1.0.0 # BSD
+pycrypto>=2.6 # Public Domain
+pyOpenSSL>=0.14 # Apache-2.0
 ldap3>=0.9.8.2 # LGPLv3
-keystonemiddleware>=4.0.0
-six>=1.9.0
-SQLAlchemy<1.1.0,>=1.0.10
+keystonemiddleware>=4.0.0 # Apache-2.0
+six>=1.9.0 # MIT
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
 stevedore>=1.5.0 # Apache-2.0
-WebOb>=1.2.3
+WebOb>=1.2.3 # MIT

test-requirements.txt

@@ -1,23 +1,23 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-coverage>=3.6
+coverage>=3.6 # Apache-2.0
 hacking<0.11,>=0.10.0
-mock>=1.2
+mock>=1.2 # BSD
 oslotest>=1.10.0 # Apache-2.0
 pykmip>=0.4.0 # Apache 2.0 License
-testrepository>=0.0.18
-testtools>=1.4.0
-fixtures>=1.3.1
-requests!=2.9.0,>=2.8.1
-python-keystoneclient!=1.8.0,>=1.6.0
-tempest-lib>=0.13.0
-python-subunit>=0.0.18
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+fixtures>=1.3.1 # Apache-2.0/BSD
+requests!=2.9.0,>=2.8.1 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+tempest-lib>=0.13.0 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
 
 # Bandit build requirements
-bandit>=0.13.2
+bandit>=0.13.2 # Apache-2.0
 
 # Documentation build requirements
-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