diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-12-18 01:29:04 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-12-18 01:29:04 -0500 |
commit | 515a3f5b2d68d2484b49b899373f6920673cb22e (patch) | |
tree | 6e200e1f006f71ea7861047f979a7b87cf0ea71f /meta-openstack/recipes-extended/tempest/tempest/tempest.conf | |
parent | 79d4071d2d6a0896a56fddc1c4fe061d69b7609f (diff) | |
download | meta-cloud-services-515a3f5b2d68d2484b49b899373f6920673cb22e.tar.gz |
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>
Diffstat (limited to 'meta-openstack/recipes-extended/tempest/tempest/tempest.conf')
-rw-r--r-- | meta-openstack/recipes-extended/tempest/tempest/tempest.conf | 12 |
1 files changed, 6 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 | |||
376 | 376 | ||
377 | [dashboard] | 377 | [dashboard] |
378 | # URL where to find the dashboard home page | 378 | # URL where to find the dashboard home page |
379 | dashboard_url = 'http://localhost/' | 379 | dashboard_url = 'http://localhost:8080/' |
380 | 380 | ||
381 | # URL where to submit the login form | 381 | # URL where to submit the login form |
382 | login_url = 'http://localhost/auth/login/' | 382 | login_url = 'http://localhost:8080/auth/login/' |
383 | 383 | ||
384 | [scenario] | 384 | [scenario] |
385 | # Directory containing image files | 385 | # Directory containing image files |
386 | img_dir = /opt/stack/new/devstack/files/images/cirros-0.3.1-x86_64-uec | 386 | img_dir = /home/root/images/ |
387 | 387 | ||
388 | # AMI image file name | 388 | # AMI image file name |
389 | ami_img_file = cirros-0.3.1-x86_64-blank.img | 389 | ami_img_file = cirros-0.3.0-x86_64-disk.img |
390 | 390 | ||
391 | # ARI image file name | 391 | # ARI image file name |
392 | ari_img_file = cirros-0.3.1-x86_64-initrd | 392 | ari_img_file = cirros-0.3.1-x86_64-initrd |
@@ -405,7 +405,7 @@ large_ops_number = 0 | |||
405 | # Enable cli tests | 405 | # Enable cli tests |
406 | enabled = True | 406 | enabled = True |
407 | # directory where python client binaries are located | 407 | # directory where python client binaries are located |
408 | cli_dir = /usr/local/bin | 408 | cli_dir = /usr/bin |
409 | # Number of seconds to wait on a CLI timeout | 409 | # Number of seconds to wait on a CLI timeout |
410 | timeout = 15 | 410 | timeout = 15 |
411 | 411 | ||
@@ -413,7 +413,7 @@ timeout = 15 | |||
413 | # Whether or not cinder is expected to be available | 413 | # Whether or not cinder is expected to be available |
414 | cinder = True | 414 | cinder = True |
415 | # Whether or not neutron is expected to be available | 415 | # Whether or not neutron is expected to be available |
416 | neutron = false | 416 | neutron = True |
417 | # Whether or not glance is expected to be available | 417 | # Whether or not glance is expected to be available |
418 | glance = True | 418 | glance = True |
419 | # Whether or not swift is expected to be available | 419 | # Whether or not swift is expected to be available |