Updated from global requirements

Change-Id: I7f771e16773d0ca4015107b45e083139452ccf3c

requirements.txt

@@ -2,18 +2,18 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 
-argparse
-Babel>=1.3
-iso8601>=0.1.9
-debtcollector>=0.3.0 # Apache-2.0
-keystoneauth1>=2.1.0
+argparse # PSF
+Babel>=1.3 # BSD
+iso8601>=0.1.9 # MIT
+debtcollector>=1.2.0 # Apache-2.0
+keystoneauth1>=2.1.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
-PrettyTable<0.8,>=0.7
-requests!=2.9.0,>=2.8.1
-six>=1.9.0
+oslo.utils>=3.4.0 # Apache-2.0
+PrettyTable<0.8,>=0.7 # BSD
+requests!=2.9.0,>=2.8.1 # Apache-2.0
+six>=1.9.0 # MIT
 stevedore>=1.5.0 # Apache-2.0

test-requirements.txt

@@ -3,24 +3,24 @@
 # process, which may cause wedges in the gate later.
 
 hacking<0.11,>=0.10.0
-flake8-docstrings==0.2.1.post1
+flake8-docstrings==0.2.1.post1 # MIT
 
-coverage>=3.6
-fixtures>=1.3.1
-keyring>=5.5.1
-lxml>=2.3
-mock>=1.2
-oauthlib>=0.6
+coverage>=3.6 # Apache-2.0
+fixtures>=1.3.1 # Apache-2.0/BSD
+keyring>=5.5.1 # MIT/PSF
+lxml>=2.3 # BSD
+mock>=1.2 # BSD
+oauthlib>=0.6 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 reno>=0.1.1 # Apache2
 requests-mock>=0.7.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-tempest-lib>=0.13.0
-testrepository>=0.0.18
-testresources>=0.2.4
-testscenarios>=0.4
-testtools>=1.4.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+tempest-lib>=0.13.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testresources>=0.2.4 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
 # Bandit security code scanner
-bandit>=0.13.2
+bandit>=0.13.2 # Apache-2.0