From 515a3f5b2d68d2484b49b899373f6920673cb22e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 18 Dec 2013 01:29:04 -0500
Subject: tempest: improve out of the box test results

Minor tweaks to put the testr config and run_tests.sh on the target, to
facilate launching the tempest self tests.

We also modify the tempest.conf to properly locate the binaries and
enable neutron.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-extended/tempest/tempest/tempest.conf | 12 ++++++------
 meta-openstack/recipes-extended/tempest/tempest_git.bb       |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/meta-openstack/recipes-extended/tempest/tempest/tempest.conf b/meta-openstack/recipes-extended/tempest/tempest/tempest.conf
index 1406c5d..0c6819a 100644
--- a/meta-openstack/recipes-extended/tempest/tempest/tempest.conf
+++ b/meta-openstack/recipes-extended/tempest/tempest/tempest.conf
@@ -376,17 +376,17 @@ instance_type = m1.micro
 
 [dashboard]
 # URL where to find the dashboard home page
-dashboard_url = 'http://localhost/'
+dashboard_url = 'http://localhost:8080/'
 
 # URL where to submit the login form
-login_url = 'http://localhost/auth/login/'
+login_url = 'http://localhost:8080/auth/login/'
 
 [scenario]
 # Directory containing image files
-img_dir = /opt/stack/new/devstack/files/images/cirros-0.3.1-x86_64-uec
+img_dir = /home/root/images/
 
 # AMI image file name
-ami_img_file = cirros-0.3.1-x86_64-blank.img
+ami_img_file = cirros-0.3.0-x86_64-disk.img
 
 # ARI image file name
 ari_img_file = cirros-0.3.1-x86_64-initrd
@@ -405,7 +405,7 @@ large_ops_number = 0
 # Enable cli tests
 enabled = True
 # directory where python client binaries are located
-cli_dir = /usr/local/bin
+cli_dir = /usr/bin
 # Number of seconds to wait on a CLI timeout
 timeout = 15
 
@@ -413,7 +413,7 @@ timeout = 15
 # Whether or not cinder is expected to be available
 cinder = True
 # Whether or not neutron is expected to be available
-neutron = false
+neutron = True
 # Whether or not glance is expected to be available
 glance = True
 # Whether or not swift is expected to be available
diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index af2277a..86ab7ae 100644
--- a/meta-openstack/recipes-extended/tempest/tempest_git.bb
+++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb
@@ -49,6 +49,11 @@ do_install_append() {
     for t in api cli scenario stress thirdparty; do
        ln -s ${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/$t ${TEMPEST_CONF_DIR}/tests/
     done
+
+    # test infrastructure
+    cp run_tests.sh ${TEMPEST_CONF_DIR}
+    cp .testr.conf ${TEMPEST_CONF_DIR}
+    
 }
 
 PACKAGES =+ "${SRCNAME}-tests"
-- 
cgit v1.2.3-54-g00ecf