Merge "Avoid installing python-nose for RHEL6."
diff --git a/files/rpms/horizon b/files/rpms/horizon
index 151e7e2..d50482e 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,7 +16,8 @@
python-migrate
python-mox
python-netaddr
-python-nose
+# RHEL6's python-nose is incompatible with Tempest
+python-nose #dist:f16,f17,f18
python-paste #dist:f16,f17,f18
python-paste-deploy #dist:f16,f17,f18
python-pep8
diff --git a/files/rpms/swift b/files/rpms/swift
index 1b36e34..c626d8e 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -7,7 +7,8 @@
python-eventlet
python-greenlet
python-netifaces
-python-nose
+# RHEL6's python-nose is incompatible with Tempest
+python-nose # dist:f16,f17,f18
python-paste-deploy # dist:f16,f17,f18
python-setuptools # dist:f16,f17,f18
python-simplejson