Updated from global requirements

Change-Id: I7d8485958fb96c7e111eab4df21472bee27ea8d0

requirements.txt

 # 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
+pbr>=1.6 # Apache-2.0
 docker-py>=1.4.0 # Apache-2.0
 Jinja2>=2.8 # BSD License (3 clause)
 gitdb>=0.6.4 # BSD License (3 clause)
 GitPython>=1.0.1 # BSD License (3 clause)
-six>=1.9.0
+six>=1.9.0 # MIT
 oslo.config>=3.2.0 # Apache-2.0
 graphviz>=0.4.0 # MIT License

test-requirements.txt

@@ -6,18 +6,18 @@ hacking>=0.10.0
 oslo.log>=1.14.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-PyYAML>=3.1.0
-python-barbicanclient>=3.3.0
-python-ceilometerclient>=2.0.0
-python-cinderclient>=1.3.1
-python-glanceclient>=1.2.0
-python-heatclient>=0.6.0
-python-keystoneclient!=1.8.0,>=1.6.0
-python-neutronclient>=2.6.0
-python-novaclient!=2.33.0,>=2.29.0
-python-swiftclient>=2.2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+PyYAML>=3.1.0 # MIT
+python-barbicanclient>=3.3.0 # Apache-2.0
+python-ceilometerclient>=2.2.1 # Apache-2.0
+python-cinderclient>=1.3.1 # Apache-2.0
+python-glanceclient>=1.2.0 # Apache-2.0
+python-heatclient>=0.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
+python-neutronclient>=2.6.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-swiftclient>=2.2.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 zake>=0.1.6 # Apache-2.0