From dde310007c20d2df36dbebe4bdb10f44529e74ac Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Fri, 19 Jun 2015 17:07:38 +0000 Subject: OpenStack: add configuration for scenario tests Change-Id: Ifaaced5256ce7aeca786118a2075c991b3fa103f --- .../etc/tempest/set_openstack_to_run_tempest.sh | 9 +++++++++ install-files/openstack/etc/tempest/tempest.conf | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/install-files/openstack/etc/tempest/set_openstack_to_run_tempest.sh b/install-files/openstack/etc/tempest/set_openstack_to_run_tempest.sh index 30539488..8c0b8da3 100755 --- a/install-files/openstack/etc/tempest/set_openstack_to_run_tempest.sh +++ b/install-files/openstack/etc/tempest/set_openstack_to_run_tempest.sh @@ -107,7 +107,16 @@ create_tempest_custom_flavor(){ sed -r -i "s/[#]?flavor_ref_alt =.*/flavor_ref_alt = 6/" tempest.conf } +prepare_scenario_tests(){ + local imgdir=/opt/openstack/images/ + mkdir -p "$imgdir" + wget -c http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz \ + -O "$imgdir"/cirros-0.3.1-x86_64-uec.tar.gz + cd "$imgdir" && tar xvf cirros-0.3.1-x86_64-uec.tar.gz +} + # Configure Openstack for running tempest tests. create_admin_user_env create_image_for_user "$admin_username" "$admin_test_image" create_tempest_custom_flavor +prepare_scenario_tests diff --git a/install-files/openstack/etc/tempest/tempest.conf b/install-files/openstack/etc/tempest/tempest.conf index c045392c..f84eb1c0 100644 --- a/install-files/openstack/etc/tempest/tempest.conf +++ b/install-files/openstack/etc/tempest/tempest.conf @@ -942,29 +942,29 @@ lock_path = /run/lock # # Directory containing image files (string value) -#img_dir = /opt/stack/new/devstack/files/images/cirros-0.3.1-x86_64-uec +img_dir = /opt/openstack/images/ # Image file name (string value) # Deprecated group/name - [DEFAULT]/qcow2_img_file -#img_file = cirros-0.3.1-x86_64-disk.img +img_file = cirros-0.3.1-x86_64-disk.img # Image disk format (string value) -#img_disk_format = qcow2 +img_disk_format = qcow2 # Image container format (string value) -#img_container_format = bare +img_container_format = bare # AMI image file name (string value) -#ami_img_file = cirros-0.3.1-x86_64-blank.img +ami_img_file = cirros-0.3.1-x86_64-blank.img # ARI image file name (string value) -#ari_img_file = cirros-0.3.1-x86_64-initrd +ari_img_file = cirros-0.3.1-x86_64-initrd # AKI image file name (string value) -#aki_img_file = cirros-0.3.1-x86_64-vmlinuz +aki_img_file = cirros-0.3.1-x86_64-vmlinuz # ssh username for the image file (string value) -#ssh_user = cirros +ssh_user = cirros # specifies how many resources to request at once. Used for large # operations testing. (integer value) -- cgit v1.2.1