Comment 12 for bug 1678326

Reviewed: https://review.openstack.org/452364
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=361b88383130be8da9d474d02a9f62136239d506
Submitter: Jenkins
Branch: stable/ocata

commit 361b88383130be8da9d474d02a9f62136239d506
Author: Matt Riedemann <email address hidden>
Date: Fri Mar 31 21:08:55 2017 -0400

    Commit usage decrement after destroying instance

    This fixes a regression in Ocata where we were always
    decrementing quota usage during instance delete even
    if we failed to delete the instance. Now the reservation
    is properly committed after the instance is destroyed.

    The related functional test is updated to show this working
    correctly now.

    Conflicts:
          nova/compute/api.py
          nova/tests/unit/compute/test_compute_api.py

    NOTE(mriedem): The conflict is due to not having change
    edf51119fa59ff8a3337abb9107a06fa33d3c68f in stable/ocata.

    Change-Id: I5200e72c195e12b5a069cbae3f209492ed569fb4
    Closes-Bug: #1678326
    (cherry picked from commit 5c1af55cbe526dea72308767df8709064ffae6a8)