thirdparty.boto tests was removed from tempest and this section
is no needed more
Change-Id: Ibec0534d118423be7a51c2e2b82f1c61531503a0
... | ... |
@@ -13,7 +13,6 @@ if is_service_enabled tempest; then |
13 | 13 |
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then |
14 | 14 |
echo_summary "Initializing Tempest" |
15 | 15 |
configure_tempest |
16 |
- init_tempest |
|
17 | 16 |
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then |
18 | 17 |
# local.conf Tempest option overrides |
19 | 18 |
: |
... | ... |
@@ -35,7 +35,6 @@ |
35 | 35 |
# |
36 | 36 |
# - install_tempest |
37 | 37 |
# - configure_tempest |
38 |
-# - init_tempest |
|
39 | 38 |
|
40 | 39 |
# Save trace setting |
41 | 40 |
_XTRACE_TEMPEST=$(set +o | grep xtrace) |
... | ... |
@@ -67,9 +66,6 @@ BUILD_TIMEOUT=${BUILD_TIMEOUT:-196} |
67 | 67 |
# have tempest installed in DevStack by default. |
68 | 68 |
INSTALL_TEMPEST=${INSTALL_TEMPEST:-"True"} |
69 | 69 |
|
70 |
-BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}" |
|
71 |
-BOTO_CONF=/etc/boto.cfg |
|
72 |
- |
|
73 | 70 |
# Cinder/Volume variables |
74 | 71 |
TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default} |
75 | 72 |
TEMPEST_DEFAULT_VOLUME_VENDOR="Open Source" |
... | ... |
@@ -131,7 +127,6 @@ function configure_tempest { |
131 | 131 |
local flavor_lines |
132 | 132 |
local public_network_id |
133 | 133 |
local public_router_id |
134 |
- local boto_instance_type="m1.tiny" |
|
135 | 134 |
local ssh_connect_method="fixed" |
136 | 135 |
|
137 | 136 |
# Save IFS |
... | ... |
@@ -202,14 +197,12 @@ function configure_tempest { |
202 | 202 |
nova flavor-create m1.nano 42 64 0 1 |
203 | 203 |
fi |
204 | 204 |
flavor_ref=42 |
205 |
- boto_instance_type=m1.nano |
|
206 | 205 |
if [[ ! ( $available_flavors =~ 'm1.micro' ) ]]; then |
207 | 206 |
nova flavor-create m1.micro 84 128 0 1 |
208 | 207 |
fi |
209 | 208 |
flavor_ref_alt=84 |
210 | 209 |
else |
211 | 210 |
# Check Nova for existing flavors, if ``DEFAULT_INSTANCE_TYPE`` is set use it. |
212 |
- boto_instance_type=$DEFAULT_INSTANCE_TYPE |
|
213 | 211 |
IFS=$'\r\n' |
214 | 212 |
flavors="" |
215 | 213 |
for line in $available_flavors; do |
... | ... |
@@ -254,15 +247,6 @@ function configure_tempest { |
254 | 254 |
awk '{print $2}') |
255 | 255 |
fi |
256 | 256 |
|
257 |
- EC2_URL=$(get_endpoint_url ec2 public || true) |
|
258 |
- if [[ -z $EC2_URL ]]; then |
|
259 |
- EC2_URL="$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" |
|
260 |
- fi |
|
261 |
- S3_URL=$(get_endpoint_url s3 public || true) |
|
262 |
- if [[ -z $S3_URL ]]; then |
|
263 |
- S3_URL="http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}" |
|
264 |
- fi |
|
265 |
- |
|
266 | 257 |
iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG |
267 | 258 |
|
268 | 259 |
# Oslo |
... | ... |
@@ -275,8 +259,6 @@ function configure_tempest { |
275 | 275 |
# Timeouts |
276 | 276 |
iniset $TEMPEST_CONFIG compute build_timeout $BUILD_TIMEOUT |
277 | 277 |
iniset $TEMPEST_CONFIG volume build_timeout $BUILD_TIMEOUT |
278 |
- iniset $TEMPEST_CONFIG boto build_timeout $BUILD_TIMEOUT |
|
279 |
- iniset $TEMPEST_CONFIG boto http_socket_timeout 5 |
|
280 | 278 |
|
281 | 279 |
# Identity |
282 | 280 |
iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/" |
... | ... |
@@ -429,16 +411,6 @@ function configure_tempest { |
429 | 429 |
fi |
430 | 430 |
iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions |
431 | 431 |
|
432 |
- # boto |
|
433 |
- iniset $TEMPEST_CONFIG boto ec2_url "$EC2_URL" |
|
434 |
- iniset $TEMPEST_CONFIG boto s3_url "$S3_URL" |
|
435 |
- iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH" |
|
436 |
- iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd.manifest.xml |
|
437 |
- iniset $TEMPEST_CONFIG boto ami_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img.manifest.xml |
|
438 |
- iniset $TEMPEST_CONFIG boto aki_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz.manifest.xml |
|
439 |
- iniset $TEMPEST_CONFIG boto instance_type "$boto_instance_type" |
|
440 |
- iniset $TEMPEST_CONFIG boto http_socket_timeout 30 |
|
441 |
- |
|
442 | 432 |
# Orchestration Tests |
443 | 433 |
if is_service_enabled heat; then |
444 | 434 |
if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then |
... | ... |
@@ -578,12 +550,6 @@ function configure_tempest { |
578 | 578 |
iniset $TEMPEST_CONFIG service_available cinder "False" |
579 | 579 |
fi |
580 | 580 |
|
581 |
- if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then |
|
582 |
- # Use the ``BOTO_CONFIG`` environment variable to point to this file |
|
583 |
- iniset -sudo $BOTO_CONF Boto ca_certificates_file $SSL_BUNDLE_FILE |
|
584 |
- sudo chown $STACK_USER $BOTO_CONF |
|
585 |
- fi |
|
586 |
- |
|
587 | 581 |
# Auth |
588 | 582 |
iniset $TEMPEST_CONFIG auth tempest_roles "Member" |
589 | 583 |
if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then |
... | ... |
@@ -645,35 +611,6 @@ function install_tempest { |
645 | 645 |
popd |
646 | 646 |
} |
647 | 647 |
|
648 |
-# init_tempest() - Initialize EC2 images |
|
649 |
-function init_tempest { |
|
650 |
- local base_image_name=cirros-${CIRROS_VERSION}-${CIRROS_ARCH} |
|
651 |
- # /opt/stack/devstack/files/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec |
|
652 |
- local image_dir="$FILES/images/${base_image_name}-uec" |
|
653 |
- local kernel="$image_dir/${base_image_name}-vmlinuz" |
|
654 |
- local ramdisk="$image_dir/${base_image_name}-initrd" |
|
655 |
- local disk_image="$image_dir/${base_image_name}-blank.img" |
|
656 |
- if is_service_enabled nova; then |
|
657 |
- # If the CirrOS uec downloaded and the system is UEC capable |
|
658 |
- if [ -f "$kernel" -a -f "$ramdisk" -a -f "$disk_image" -a "$VIRT_DRIVER" != "openvz" \ |
|
659 |
- -a \( "$LIBVIRT_TYPE" != "lxc" -o "$VIRT_DRIVER" != "libvirt" \) ]; then |
|
660 |
- echo "Prepare aki/ari/ami Images" |
|
661 |
- mkdir -p $BOTO_MATERIALS_PATH |
|
662 |
- ( #new namespace |
|
663 |
- # euca2ools should be installed to call euca-* commands |
|
664 |
- is_package_installed euca2ools || install_package euca2ools |
|
665 |
- # tenant:demo ; user: demo |
|
666 |
- source $TOP_DIR/accrc/demo/demo |
|
667 |
- euca-bundle-image -r ${CIRROS_ARCH} -i "$kernel" --kernel true -d "$BOTO_MATERIALS_PATH" |
|
668 |
- euca-bundle-image -r ${CIRROS_ARCH} -i "$ramdisk" --ramdisk true -d "$BOTO_MATERIALS_PATH" |
|
669 |
- euca-bundle-image -r ${CIRROS_ARCH} -i "$disk_image" -d "$BOTO_MATERIALS_PATH" |
|
670 |
- ) 2>&1 </dev/null | cat |
|
671 |
- else |
|
672 |
- echo "Boto materials are not prepared" |
|
673 |
- fi |
|
674 |
- fi |
|
675 |
-} |
|
676 |
- |
|
677 | 648 |
# Restore xtrace |
678 | 649 |
$_XTRACE_TEMPEST |
679 | 650 |
|