Merge "Allow installing tempest only with keystone"

This commit is contained in:
Jenkins 2014-11-14 03:17:19 +00:00 committed by Gerrit Code Review
commit d4732d76fc

View File

@ -111,6 +111,7 @@ function configure_tempest {
# ... Also ensure we only take active images, so we don't get snapshots in process # ... Also ensure we only take active images, so we don't get snapshots in process
declare -a images declare -a images
if is_service_enabled glance; then
while read -r IMAGE_NAME IMAGE_UUID; do while read -r IMAGE_NAME IMAGE_UUID; do
if [ "$IMAGE_NAME" = "$DEFAULT_IMAGE_NAME" ]; then if [ "$IMAGE_NAME" = "$DEFAULT_IMAGE_NAME" ]; then
image_uuid="$IMAGE_UUID" image_uuid="$IMAGE_UUID"
@ -139,6 +140,7 @@ function configure_tempest {
fi fi
;; ;;
esac esac
fi
# Create tempest.conf from tempest.conf.sample # Create tempest.conf from tempest.conf.sample
# copy every time, because the image UUIDS are going to change # copy every time, because the image UUIDS are going to change
@ -162,6 +164,7 @@ function configure_tempest {
ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo} ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
ADMIN_TENANT_ID=$(openstack project list | awk "/ admin / { print \$2 }") ADMIN_TENANT_ID=$(openstack project list | awk "/ admin / { print \$2 }")
if is_service_enabled nova; then
# If the ``DEFAULT_INSTANCE_TYPE`` not declared, use the new behavior # If the ``DEFAULT_INSTANCE_TYPE`` not declared, use the new behavior
# Tempest creates instane types for himself # Tempest creates instane types for himself
if [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then if [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then
@ -220,6 +223,7 @@ function configure_tempest {
fi fi
done done
fi fi
fi
if [ "$Q_USE_NAMESPACE" != "False" ]; then if [ "$Q_USE_NAMESPACE" != "False" ]; then
tenant_networks_reachable=false tenant_networks_reachable=false
@ -463,6 +467,7 @@ function init_tempest {
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"
if is_service_enabled nova; then
# if the cirros uec downloaded and the system is uec capable # if the cirros uec downloaded and the system is uec capable
if [ -f "$kernel" -a -f "$ramdisk" -a -f "$disk_image" -a "$VIRT_DRIVER" != "openvz" \ if [ -f "$kernel" -a -f "$ramdisk" -a -f "$disk_image" -a "$VIRT_DRIVER" != "openvz" \
-a \( "$LIBVIRT_TYPE" != "lxc" -o "$VIRT_DRIVER" != "libvirt" \) ]; then -a \( "$LIBVIRT_TYPE" != "lxc" -o "$VIRT_DRIVER" != "libvirt" \) ]; then
@ -478,6 +483,7 @@ function init_tempest {
else else
echo "Boto materials are not prepared" echo "Boto materials are not prepared"
fi fi
fi
} }
# Restore xtrace # Restore xtrace