commit 0cbaa412147849032131f429daeb480e711235bb
author Jenkins <jenkins@review.openstack.org> Mon Jul 29 21:54:52 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 29 21:54:52 2013 +0000
tree 478b7745b22fc88026da269f61f9094aa34f8b6d
parent b6f7ea4fb0bfd4bcc1d1bb35f97d29eb70075b73
parent fea70f80c0f653910b68dc5557a9f5b318091f72

Merge "Configure horizon and horizon URLs in Tempest"

files/apts/swift

diff --git a/files/apts/swift b/files/apts/swift
index c52c68b..1c283cf 100644
--- a/files/apts/swift
+++ b/files/apts/swift
@@ -1,5 +1,6 @@
 curl
 gcc
+libffi-dev
 memcached
 python-configobj
 python-coverage

files/rpms/swift

diff --git a/files/rpms/swift b/files/rpms/swift
index ee1fad8..2cc4a0b 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -1,5 +1,6 @@
 curl
 gcc
+libffi-devel
 memcached
 python-configobj
 python-coverage

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 9c9c921..f8e2ca9 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -195,6 +195,9 @@
         fi
     fi
 
+    # Oslo
+    iniset $TEMPEST_CONF DEFAULT lock_path $TMPDIR
+
     # Timeouts
     iniset $TEMPEST_CONF compute build_timeout $BUILD_TIMEOUT
     iniset $TEMPEST_CONF volume build_timeout $BUILD_TIMEOUT