openstack/devstack
Code Issues Proposed changes

Merge "Use the correct directory for image files in tempest"

Browse Source
This commit is contained in:
Jenkins 2013-01-22 23:05:49 +00:00 committed by Gerrit Code Review
commit 516f0cce42
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tempest
View File

@ -5,7 +5,7 @@
# ``functions`` file # ``functions`` file
# ``lib/nova`` service is runing # ``lib/nova`` service is runing
# <list other global vars that are assumed to be defined> # <list other global vars that are assumed to be defined>
# - ``DEST`` # - ``DEST``, ``FILES``
# - ``ADMIN_PASSWORD`` # - ``ADMIN_PASSWORD``
# - ``DEFAULT_IMAGE_NAME`` # - ``DEFAULT_IMAGE_NAME``
# - ``S3_SERVICE_PORT`` # - ``S3_SERVICE_PORT``
@ -48,7 +48,7 @@ BUILD_INTERVAL=3
BUILD_TIMEOUT=400 BUILD_TIMEOUT=400
BOTO_MATERIALS_PATH="$DEST/devstack/files/images/s3-materials/cirros-0.3.0" BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-0.3.0"
# Entry Points # Entry Points
# ------------ # ------------
@ -294,8 +294,7 @@ function install_tempest() {
function init_tempest() { function init_tempest() {
local base_image_name=cirros-0.3.0-x86_64 local base_image_name=cirros-0.3.0-x86_64
# /opt/stack/devstack/files/images/cirros-0.3.0-x86_64-uec # /opt/stack/devstack/files/images/cirros-0.3.0-x86_64-uec
local devstack_dir="$DEST/devstack" local image_dir="$FILES/images/${base_image_name}-uec"
local image_dir="$devstack_dir/files/images/${base_image_name}-uec"
local kernel="$image_dir/${base_image_name}-vmlinuz" local kernel="$image_dir/${base_image_name}-vmlinuz"
local ramdisk="$image_dir/${base_image_name}-initrd" local ramdisk="$image_dir/${base_image_name}-initrd"
local disk_image="$image_dir/${base_image_name}-blank.img" local disk_image="$image_dir/${base_image_name}-blank.img"