commit f829e46bd099b10e2f9a03153e3681db89b90811
author Jenkins <jenkins@review.openstack.org> Mon Jul 29 22:49:52 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 29 22:49:52 2013 +0000
tree 29d712f991f6114d115850d561f061c380c3550d
parent 0cbaa412147849032131f429daeb480e711235bb
parent 14ccba0e400f7f0b5916ab75eca3b44d8c1486d2

Merge "Set tempest lock_path to default in $DATA_DIR"

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 9c4e604..6c68337 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -280,11 +280,15 @@
         iniset $TEMPEST_CONF volume backend2_name "LVM_iSCSI_2"
     fi
 
+    # Dashboard
+    iniset $TEMPEST_CONF dashboard dashboard_url "http://$SERVICE_HOST/"
+    iniset $TEMPEST_CONF dashboard login_url "http://$SERVICE_HOST/auth/login/"
+
     # cli
     iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
 
     # service_available
-    for service in nova cinder glance neutron swift heat ; do
+    for service in nova cinder glance neutron swift heat horizon ; do
         if is_service_enabled $service ; then
             iniset $TEMPEST_CONF service_available $service "True"
         else