Comment 5 for bug 1665719

Reviewed: https://review.openstack.org/435620
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=642caf0c58ed0a0e0c06103d2e3ef001c1ae142f
Submitter: Jenkins
Branch: stable/newton

commit 642caf0c58ed0a0e0c06103d2e3ef001c1ae142f
Author: melanie witt <email address hidden>
Date: Fri Feb 17 17:27:57 2017 +0000

    Skip soft-deleted records in 330_enforce_mitaka_online_migrations

    The 330_enforce_mitaka_online_migrations migration considers
    soft-deleted records as unmigrated (the blocker migration uses the
    select function from sqlalchemy), but the online migrations only
    migrate non-deleted records (the migrations use the model_query
    function which defaults to read_deleted='no'). So even after running
    all of the online migrations, operators can get stuck until they can
    hard delete any soft-deleted compute_nodes, aggregates, and
    pci_devices records they have.

     Conflicts:
     nova/tests/unit/db/test_sqlalchemy_migration.py

    NOTE(melwitt): The conflict is due to ocata unit tests that don't
    exist in newton.

    Closes-Bug: #1665719

    Change-Id: I2285005098b7dab7753366f53667ff8d4532d668
    (cherry picked from commit 6d64b7274410ae45b95bd7ac7f702c16daaa0fcd)