Merge "Add h-api to suggested ENABLED_SERVICES for Heat"
diff --git a/files/rpms/horizon b/files/rpms/horizon
index d50482e..151e7e2 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,8 +16,7 @@
python-migrate
python-mox
python-netaddr
-# RHEL6's python-nose is incompatible with Tempest
-python-nose #dist:f16,f17,f18
+python-nose
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 c626d8e..1b36e34 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -7,8 +7,7 @@
python-eventlet
python-greenlet
python-netifaces
-# RHEL6's python-nose is incompatible with Tempest
-python-nose # dist:f16,f17,f18
+python-nose
python-paste-deploy # dist:f16,f17,f18
python-setuptools # dist:f16,f17,f18
python-simplejson
diff --git a/openrc b/openrc
index 8af2854..2d5d48a 100644
--- a/openrc
+++ b/openrc
@@ -20,9 +20,6 @@
# Find the other rc files
RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
-# Import common functions
-source $RC_DIR/functions
-
# Load local configuration
source $RC_DIR/stackrc
@@ -80,7 +77,3 @@
export NOVA_VERSION=${NOVA_VERSION:-1.1}
# In the future this will change names:
export COMPUTE_API_VERSION=${COMPUTE_API_VERSION:-$NOVA_VERSION}
-
-# set log level to DEBUG (helps debug issues)
-# export KEYSTONECLIENT_DEBUG=1
-# export NOVACLIENT_DEBUG=1
diff --git a/stack.sh b/stack.sh
index 5dea000..16533df 100755
--- a/stack.sh
+++ b/stack.sh
@@ -609,6 +609,15 @@
# transiently, meaning we avoid the issue of it not being cleaned
# out properly. Note we do this before the track-depends below.
pip_install hgtools
+
+ # The version of python-nose in the RHEL6 repo is incompatible
+ # with Tempest. As a workaround:
+
+ # Install nose 1.1 (Tempest-compatible) from EPEL
+ install_package python-nose1.1
+ # Add a symlink for the new nosetests to allow tox for Tempest to
+ # work unmolested.
+ sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests
fi
TRACK_DEPENDS=${TRACK_DEPENDS:-False}