Comment 36 for bug 1499669

Reviewed: https://review.openstack.org/375472
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=33d2395bfa0ed6b9305e8cc231e66b81e1887ef0
Submitter: Jenkins
Branch: stable/mitaka

commit 33d2395bfa0ed6b9305e8cc231e66b81e1887ef0
Author: Zane Bitter <email address hidden>
Date: Thu Sep 22 09:44:56 2016 -0400

    Increase the timeout for the stop_stack message

    Previously, the stop_stack message accidentally used the
    engine_life_check_timeout (by default, 2s). But unlike other messages sent
    using that timeout, stop_stack needs to synchronously kill all running
    threads operating on the stack. For a very large stack, this can easily
    take much longer than a couple of seconds. This patch increases the timeout
    to give a better chance of being able to start the delete.

    A functional test is added, but skipped when convergence is enabled.
    This is because cancelling in-progress operations upon delete was not
    supported under convergence in Mitaka (support was added in Newton). The
    bug fix affects only the legacy path anyway.

    Change-Id: I4b36ed7f1025b6439aeab63d71041bb2000363a0
    Closes-Bug: #1499669
    (cherry picked from commit e56fc689e19d92b5a3d23736d472c9a1fc698537)