From 3e3309672f399be1bc3558e260104a2db2595970 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 28 Sep 2017 14:52:56 -0400 Subject: [PATCH] Fix live migration grenade ceph setup Grenade runs in singleconductor mode for queens as of change: If4c82ca12fe7b8b1ca7cfd8181d24dbd8dad3baa However, the nova configuration during ceph setup was using NOVA_CPU_CONF which is /etc/nova/nova-cpu.conf, which is not what we want when configuring nova.conf for the compute service in singleconductor mode. Devstack has similar logic for stuff like this, so we just have to handle it here since we're in a special snowflake. The stable/queens systemd stuff is all removed too since we run with systemd on the old pike side and can restart services properly with systemd on the new queens side during grenade live migration CI job runs. Change-Id: Iccb8eb55a5cc2a3d08e7fd6e31c89b3b5f8d0c70 Closes-Bug: #1720191 --- nova/tests/live_migration/hooks/run_tests.sh | 35 ++++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/nova/tests/live_migration/hooks/run_tests.sh b/nova/tests/live_migration/hooks/run_tests.sh index 2595e8503241..f8683ecd862a 100755 --- a/nova/tests/live_migration/hooks/run_tests.sh +++ b/nova/tests/live_migration/hooks/run_tests.sh @@ -41,25 +41,24 @@ echo '2. NFS testing is skipped due to setup failures with Ubuntu 16.04' #run_tempest "NFS shared storage test" "live_migration" #nfs_teardown -# NOTE(mriedem): devstack in Pike defaults to using systemd but the old side -# for grenade is using screen and that follows through to the new side. Since -# the restart scripts are hard-coded to assume systemd in this job, they will -# fail if the services weren't started under systemd. So we have to skip this -# for grenade jobs in Pike until the bug is fixed to handle restarting services -# running under screen or systemd, or until Queens is our master branch. -# The GRENADE_OLD_BRANCH variable is exported from devstack-gate, not in the -# devstack local.conf. -if [[ "$GRENADE_OLD_BRANCH" == "stable/ocata" ]]; then - # TODO(mriedem): Remove this in Queens if we haven't fixed the bug yet. - echo '3. Grenade testing with Ceph is disabled until bug 1691769 is fixed or Queens.' -else - 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 - configure_and_start_nova - run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))" +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 + +# 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))" + set +e #echo '4. test with Ceph for volumes and root + ephemeral disk'