Comment 9 for bug 1813216

Reviewed: https://review.openstack.org/640186
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=c4a2a32f07cbe139b5889654bbc82d3ddeaeeb94
Submitter: Zuul
Branch: stable/rocky

commit c4a2a32f07cbe139b5889654bbc82d3ddeaeeb94
Author: Matt Riedemann <email address hidden>
Date: Tue Feb 5 10:40:33 2019 -0500

    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)