Comment 6 for bug 1466696

Reviewed: https://review.openstack.org/316150
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=d836c7172d5662207ea89a4489d41fc9b28e34f5
Submitter: Jenkins
Branch: stable/liberty

commit d836c7172d5662207ea89a4489d41fc9b28e34f5
Author: Sean Dague <email address hidden>
Date: Mon Nov 9 16:54:19 2015 -0500

    skip lock_unlock_server test for cells

    The cells architecture of doing db replay makes this call
    fundamentally racey for cells. The contract is that if you request an
    action on a server and it is locked, you get a 409 at the API, and are
    done. If you get a 2xx, the resource is not locked, and life is good.

    Except in cells, the API db will be updated, and the API will return
    all is well. Except the db replay hasn't happened for the cell, so the
    additional check in the nova compute for locked blows up.

    The fix probably involves the nova-compute check doing a timed retry
    under cells because of replication lags.

    Conflicts:
            devstack/tempest-dsvm-cells-rc

    NOTE(mriedem): The conflict is due to an additional test being
    skipped in liberty that wasn't skipped in mitaka.

    Change-Id: Ic18407b8372c286d8e258860f3e2bf76eceef2aa
    Related-Bug: #1466696
    (cherry picked from commit 02de17c72ac0f0824df2b3d460739a58cb6b5285)