Skip to content

Commit 6136c4e

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "remove configuration for boto section"
2 parents 4847ee6 + ba23ba3 commit 6136c4e

2 files changed

Lines changed: 0 additions & 64 deletions

File tree

‎extras.d/80-tempest.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ if is_service_enabled tempest; then
1313
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
1414
echo_summary "Initializing Tempest"
1515
configure_tempest
16-
init_tempest
1716
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
1817
# local.conf Tempest option overrides
1918
:

‎lib/tempest‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#
3636
# - install_tempest
3737
# - configure_tempest
38-
# - init_tempest
3938

4039
# Save trace setting
4140
_XTRACE_TEMPEST=$(set +o | grep xtrace)
@@ -67,9 +66,6 @@ BUILD_TIMEOUT=${BUILD_TIMEOUT:-196}
6766
# have tempest installed in DevStack by default.
6867
INSTALL_TEMPEST=${INSTALL_TEMPEST:-"True"}
6968

70-
BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}"
71-
BOTO_CONF=/etc/boto.cfg
72-
7369
# Cinder/Volume variables
7470
TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}
7571
TEMPEST_DEFAULT_VOLUME_VENDOR="Open Source"
@@ -131,7 +127,6 @@ function configure_tempest {
131127
local flavor_lines
132128
local public_network_id
133129
local public_router_id
134-
local boto_instance_type="m1.tiny"
135130
local ssh_connect_method="fixed"
136131

137132
# Save IFS
@@ -202,14 +197,12 @@ function configure_tempest {
202197
nova flavor-create m1.nano 42 64 0 1
203198
fi
204199
flavor_ref=42
205-
boto_instance_type=m1.nano
206200
if [[ ! ( $available_flavors =~ 'm1.micro' ) ]]; then
207201
nova flavor-create m1.micro 84 128 0 1
208202
fi
209203
flavor_ref_alt=84
210204
else
211205
# Check Nova for existing flavors, if ``DEFAULT_INSTANCE_TYPE`` is set use it.
212-
boto_instance_type=$DEFAULT_INSTANCE_TYPE
213206
IFS=$'\r\n'
214207
flavors=""
215208
for line in $available_flavors; do
@@ -254,15 +247,6 @@ function configure_tempest {
254247
awk '{print $2}')
255248
fi
256249

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-
266250
iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG
267251

268252
# Oslo
@@ -275,8 +259,6 @@ function configure_tempest {
275259
# Timeouts
276260
iniset $TEMPEST_CONFIG compute build_timeout $BUILD_TIMEOUT
277261
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
280262

281263
# Identity
282264
iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/"
@@ -422,16 +404,6 @@ function configure_tempest {
422404
fi
423405
iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions
424406

425-
# boto
426-
iniset $TEMPEST_CONFIG boto ec2_url "$EC2_URL"
427-
iniset $TEMPEST_CONFIG boto s3_url "$S3_URL"
428-
iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH"
429-
iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd.manifest.xml
430-
iniset $TEMPEST_CONFIG boto ami_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img.manifest.xml
431-
iniset $TEMPEST_CONFIG boto aki_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz.manifest.xml
432-
iniset $TEMPEST_CONFIG boto instance_type "$boto_instance_type"
433-
iniset $TEMPEST_CONFIG boto http_socket_timeout 30
434-
435407
# Orchestration Tests
436408
if is_service_enabled heat; then
437409
if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
@@ -574,12 +546,6 @@ function configure_tempest {
574546
iniset $TEMPEST_CONFIG service_available cinder "False"
575547
fi
576548

577-
if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
578-
# Use the ``BOTO_CONFIG`` environment variable to point to this file
579-
iniset -sudo $BOTO_CONF Boto ca_certificates_file $SSL_BUNDLE_FILE
580-
sudo chown $STACK_USER $BOTO_CONF
581-
fi
582-
583549
# Auth
584550
iniset $TEMPEST_CONFIG auth tempest_roles "Member"
585551
if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then
@@ -641,35 +607,6 @@ function install_tempest {
641607
popd
642608
}
643609

644-
# init_tempest() - Initialize EC2 images
645-
function init_tempest {
646-
local base_image_name=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}
647-
# /opt/stack/devstack/files/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec
648-
local image_dir="$FILES/images/${base_image_name}-uec"
649-
local kernel="$image_dir/${base_image_name}-vmlinuz"
650-
local ramdisk="$image_dir/${base_image_name}-initrd"
651-
local disk_image="$image_dir/${base_image_name}-blank.img"
652-
if is_service_enabled nova; then
653-
# If the CirrOS uec downloaded and the system is UEC capable
654-
if [ -f "$kernel" -a -f "$ramdisk" -a -f "$disk_image" -a "$VIRT_DRIVER" != "openvz" \
655-
-a \( "$LIBVIRT_TYPE" != "lxc" -o "$VIRT_DRIVER" != "libvirt" \) ]; then
656-
echo "Prepare aki/ari/ami Images"
657-
mkdir -p $BOTO_MATERIALS_PATH
658-
( #new namespace
659-
# euca2ools should be installed to call euca-* commands
660-
is_package_installed euca2ools || install_package euca2ools
661-
# tenant:demo ; user: demo
662-
source $TOP_DIR/accrc/demo/demo
663-
euca-bundle-image -r ${CIRROS_ARCH} -i "$kernel" --kernel true -d "$BOTO_MATERIALS_PATH"
664-
euca-bundle-image -r ${CIRROS_ARCH} -i "$ramdisk" --ramdisk true -d "$BOTO_MATERIALS_PATH"
665-
euca-bundle-image -r ${CIRROS_ARCH} -i "$disk_image" -d "$BOTO_MATERIALS_PATH"
666-
) 2>&1 </dev/null | cat
667-
else
668-
echo "Boto materials are not prepared"
669-
fi
670-
fi
671-
}
672-
673610
# Restore xtrace
674611
$_XTRACE_TEMPEST
675612

0 commit comments

Comments
 (0)