Updated from global requirements

Change-Id: I68ad139345040dee6e5b0e8a7477acb84aa1a06b

Author: OpenStack Proposal Bot

requirements.txt

@@ -1,20 +1,20 @@
 # 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.
-pbr>=1.6
-six>=1.9.0
+pbr>=1.6 # Apache-2.0
+six>=1.9.0 # MIT
 
-Babel>=1.3
+Babel>=1.3 # BSD
 cliff>=1.15.0 # Apache-2.0
-keystoneauth1>=2.1.0
-openstacksdk
-os-client-config>=1.13.1
+keystoneauth1>=2.1.0 # Apache-2.0
+openstacksdk # Apache-2.0
+os-client-config>=1.13.1 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
-python-glanceclient>=1.2.0
-python-keystoneclient!=1.8.0,>=1.6.0
-python-novaclient!=2.33.0,>=2.29.0
-python-cinderclient>=1.3.1
-requests!=2.9.0,>=2.8.1
+oslo.utils>=3.4.0 # Apache-2.0
+python-glanceclient>=1.2.0 # Apache-2.0
+python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-cinderclient>=1.3.1 # Apache-2.0
+requests!=2.9.0,>=2.8.1 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0

test-requirements.txt

@@ -3,28 +3,28 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
 
-coverage>=3.6
-discover
-fixtures>=1.3.1
-mock>=1.2
+coverage>=3.6 # Apache-2.0
+discover # BSD
+fixtures>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # 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
-os-testr>=0.4.1
-testrepository>=0.0.18
-testtools>=1.4.0
-WebOb>=1.2.3
-tempest-lib>=0.13.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+os-testr>=0.4.1 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+WebOb>=1.2.3 # MIT
+tempest-lib>=0.13.0 # Apache-2.0
 
 # Install these to generate sphinx autodocs
-python-barbicanclient>=3.3.0
-python-congressclient>=1.0.0
-python-designateclient>=1.5.0
-python-heatclient>=0.6.0
-python-ironicclient>=0.8.0
-python-mistralclient>=1.0.0
-python-saharaclient>=0.10.0
-python-tuskarclient>=0.1.17
-python-zaqarclient>=0.3.0
+python-barbicanclient>=3.3.0 # Apache-2.0
+python-congressclient>=1.0.0 # Apache-2.0
+python-designateclient>=1.5.0 # Apache-2.0
+python-heatclient>=0.6.0 # Apache-2.0
+python-ironicclient>=0.8.0 # Apache-2.0
+python-mistralclient>=1.0.0 # Apache-2.0
+python-saharaclient>=0.10.0 # Apache-2.0
+python-tuskarclient>=0.1.17 # Apache-2.0
+python-zaqarclient>=0.3.0 # Apache-2.0