Updated from global requirements

Change-Id: Ia580f3d17a04a1e35770239ce6d56d3961af6dbd

requirements.txt

@@ -1,19 +1,19 @@
 # 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
 
-Babel>=1.3
-cliff>=1.15.0 # Apache-2.0
-ipaddress>=1.0.7;python_version<'3.3'
-passlib>=1.6
+Babel>=2.3.4 # BSD
+cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
+ipaddress>=1.0.7;python_version<'3.3' # PSF
+passlib>=1.6 # BSD
 python-ironic-inspector-client>=1.5.0 # Apache-2.0
 # os-cloud-config>=0.3.1
-python-heatclient>=0.6.0
-python-ironicclient>=1.1.0  # Apache-2.0
-python-openstackclient>=2.0.0
-six>=1.9.0
-os-cloud-config  # Apache-2.0
+python-heatclient>=1.1.0 # Apache-2.0
+python-ironicclient>=1.1.0 # Apache-2.0
+python-openstackclient>=2.1.0 # Apache-2.0
+six>=1.9.0 # MIT
+os-cloud-config # Apache-2.0
 
 # tripleo-common lib is not yet on PyPi
 -e git://github.com/openstack/tripleo-common.git#egg=tripleo_common

test-requirements.txt

@@ -3,11 +3,11 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.2
 
-coverage>=3.6
-discover
-fixtures>=1.3.1
-mock>=1.2
+coverage>=3.6 # Apache-2.0
+discover # BSD
+fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
-testtools>=1.4.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT