From c4a2a32f07cbe139b5889654bbc82d3ddeaeeb94 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 5 Feb 2019 10:40:33 -0500 Subject: [PATCH] Fix legacy-grenade-dsvm-neutron-multinode-live-migration Since change I81301eeecc7669a169deeb1e2c5d298a595aab94 in devstack, nova-cpu.conf is a copy of nova.conf minus database access. Grenade jobs also run nova-compute with nova-cpu.conf anyway so we can just drop the conditional which was otherwise messing up the config file that the ceph script would write rbd configuration which is why live block migration tests with ceph were failing. NOTE(mriedem): The original change to .zuul.yaml is not backported since it is not needed since change Ibce77d3442e21bbd5f5ce379c203542f1f31ce9e, which regressed the irrelevant-files for the job, was stein-only. Conflicts: .zuul.yaml NOTE(mriedem): The conflict is due to not having change Ibce77d3442e21bbd5f5ce379c203542f1f31ce9e nor change I93e938277454a1fc203b3d930ec1bc1eceac0a1e in stable/rocky. Change-Id: I902e459093af9b82f9033d58cffcb2a628f5ec39 Closes-Bug: #1813216 (cherry picked from commit f2db43d57ae980d8cdf08de4f5e6290d7edcc95c) --- nova/tests/live_migration/hooks/run_tests.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nova/tests/live_migration/hooks/run_tests.sh b/nova/tests/live_migration/hooks/run_tests.sh index f8683ecd862a..a5ca7a3e2751 100755 --- a/nova/tests/live_migration/hooks/run_tests.sh +++ b/nova/tests/live_migration/hooks/run_tests.sh @@ -46,16 +46,6 @@ prepare_ceph GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf} configure_and_start_glance -# Deal with grenade craziness... -if [ "$GRENADE_OLD_BRANCH" ]; then - # NOTE(mriedem): Grenade runs in singleconductor mode, so it won't use - # /etc/nova/nova-cpu.conf so we have to overwrite NOVA_CPU_CONF which is - # read in configure_and_start_nova. - if ! is_service_enabled n-super-cond; then - NOVA_CPU_CONF=$NOVA_CONF - fi -fi - configure_and_start_nova run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"