Re-enable Ceph in live migration testing

Revert I05182d8fd0df5e8f3f9f4fb11feed074990cdb9f and
Add fix to enable proper OS detection.

Closes-Bug: #1819944

Co-Authored-By: Jens Harbott <j.harbott@x-ion.de>

Change-Id: Iea6288fe6d341ee92f87a35e0b0a59fe564ab96c
This commit is contained in:
melanie witt 2019-03-13 19:45:44 +00:00 committed by Eric Fried
parent f9a6321c7b
commit 9b2a7f9e7c
1 changed files with 9 additions and 8 deletions

View File

@ -43,15 +43,16 @@ echo '2. NFS testing is skipped due to setup failures with Ubuntu 16.04'
#run_tempest "NFS shared storage test" "live_migration"
#nfs_teardown
# TODO(gmann): unskip the ceph live migration testing once bug#1819944
# is fixed for Bionic setup.
#echo '3. test with Ceph for root + ephemeral disks'
#prepare_ceph
#GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
#configure_and_start_glance
echo '3. test with Ceph for root + ephemeral disks'
# Discover and set variables for the OS version so the devstack-plugin-ceph
# scripts can find the correct repository to install the ceph packages.
GetOSVersion
prepare_ceph
GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
configure_and_start_glance
#configure_and_start_nova
#run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"
configure_and_start_nova
run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"
set +e
#echo '4. test with Ceph for volumes and root + ephemeral disk'