openstack
/
ec2-api
Code Issues Proposed changes

fix rally scenarios 

create image in openstack if it isn't created
fix problem with image size setting in glance v2

Change-Id: I42696413bcc3ed181b0b4357aa31920461e00c55
This commit is contained in:
tikitavi 2017-04-24 14:52:27 +03:00
parent a7faec0215
commit 6fe6723b7a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/create_config
View File

@ -18,6 +18,7 @@ REGULAR_IMAGE_NAME="precise"
CIRROS_IMAGE_URL="http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
CIRROS_IMAGE_FNAME="cirros-0.3.4-x86_64-disk.img"
CIRROS_IMAGE_NAME="cirros"
MAX_FAIL=20
FLAVOR_NAME="m1.ec2api"
@ -69,6 +70,17 @@ cirros_image_wget_pid=$!
# find simple image
image_id=`aws $AWS_PARAMS --profile admin ec2 describe-images --filters Name=image-type,Values=machine Name=name,Values=cirros* --query 'Images[0].ImageId' --output text`
if [[ "$image_id" == 'None' || -z "$image_id" ]]; then
wait $cirros_image_wget_pid
if [[ "$?" -eq "0" ]]; then
openstack image create --disk-format raw --container-format bare --public --file /tmp/$CIRROS_IMAGE_FNAME $CIRROS_IMAGE_NAME
if [[ "$?" -ne "0" ]]; then
echo "Creation of openstack image failed."
fi
image_id=`aws $AWS_PARAMS --profile admin ec2 describe-images --filters Name=image-type,Values=machine Name=name,Values=cirros* --query 'Images[0].ImageId' --output text`
fi
fi
# prepare ubuntu image
if [[ $RUN_LONG_TESTS == "1" ]]; then
sudo rm /tmp/$REGULAR_IMAGE_FNAME

2
rally-scenarios/plugins/context_plugin_images.py
View File

@ -64,9 +64,9 @@ class FakeImageGenerator(context.Context):
"name": "image-" + tenant_id[0:8] + "-" + str(i),
"container_format": container_format,
"disk_format": disk_format,
"size": 1000000,
}
image = glance.create(**kw)
glance.upload(image.id, '', image_size=1000000)
current_images.append(image.id)
self.context["tenants"][tenant_id]["images"] = current_images