resource-list show the wrong state after autoscaling group update failed

[huangtianhua]

1. create a stack with template:
heat_template_version: 2013-05-23

resources:
  her_policy_group:
    type: OS::Nova::ServerGroup
    # A Nova ServerGroup
    properties:
      name: nova-server-group
      policies: [affinity]

  her_asg:
    type: OS::Heat::AutoScalingGroup
    properties:
      resource:
        type: OS::Nova::Server
        properties:
            image: 74f50a38-1786-4ad0-8c12-5a5b9ba52c36
            flavor: m1.tiny
            scheduler_hints: {group: {get_resource: her_policy_group}}
      min_size: 1
      desired_capacity: 7
      max_size: 11

2. the stack create successful, and the nova instances are all active

3. update the template, change desired_capacity to 11(exceed the quota 10)

4. update the stack

5. the stack is update failed --- it's ok

6. nova list, the 10 instances are all active

7. but resource-list the nested_stack of the group, which show the wrong state,
   see: http://paste.openstack.org/show/121429/

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/129177

[huangtianhua (huangtianhua)]

found out: when the exceed quota error raised, heat will cancel all the resources update, and set the resources state to FAILED, so just add the error_wait_time to the taskgroup.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/129177
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=ddd6fc16d765e9f5aff8d8e173402caa6de6196d
Submitter: Jenkins
Branch: master

commit ddd6fc16d765e9f5aff8d8e173402caa6de6196d
Author: huangtianhua <email address hidden>
Date: Fri Oct 17 16:59:48 2014 +0800

    Don't stop update immediately on error

    When an error occurs during a stack update operation,
    don't immediately stop the operation. Instead,
    wait up to 4 minutes for resources already in progress
    to complete before forcibly cancelling them.

    Change-Id: Ib089dbc675c519668a44d1b0e3214feca5079978
    Closes-bug: #1381984

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/130102

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/130102
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=a27d37136b0c755bbc3366fbe090fed56ab65468
Submitter: Jenkins
Branch: stable/juno

commit a27d37136b0c755bbc3366fbe090fed56ab65468
Author: huangtianhua <email address hidden>
Date: Fri Oct 17 16:59:48 2014 +0800

    Don't stop update immediately on error

    When an error occurs during a stack update operation,
    don't immediately stop the operation. Instead,
    wait up to 4 minutes for resources already in progress
    to complete before forcibly cancelling them.

    Change-Id: Ib089dbc675c519668a44d1b0e3214feca5079978
    Closes-bug: #1381984
    (cherry picked from commit ddd6fc16d765e9f5aff8d8e173402caa6de6196d)