parameter doesn't represent in template after stack update failed

[huangtianhua]

1. create a stack with template:
*****************************

heat_template_version: 2016-10-14
parameters:
  res_1_value:
    default: v1
    type: string
resources:
  test_res_1:
    type: OS::Heat::TestResource
    properties:
      value: {get_param: res_1_value}
*******************************

2. update the stack with a new template:
******************************
heat_template_version: 2016-10-14
parameters:
  res_1_value:
    default: v1
    type: string
  res_2_value:
    type: string
resources:
  test_res_1:
    type: OS::Heat::TestResource
    properties:
      value: {get_param: res_1_value}
      fail: True
  test_res_2:
    type: OS::Heat::TestResource
    properties:
      value: {get_param: res_2_value}
*****************************

3. the stack update failed(we expected), and the resource test_res_2 is created successful, but template-show we will get the template like:
****************************
heat_template_version: 2016-10-14
parameters:
  res_1_value:
    default: v1
    type: string
resources:
  test_res_1:
    type: OS::Heat::TestResource
    properties:
      value: {get_param: res_1_value}
      fail: True
  test_res_2:
    type: OS::Heat::TestResource
    properties:
      value: {get_param: res_2_value}
********************************

4. There is no definition of parameter 'res_2_value'

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 59476f63bc1d5da584d5d49cae44caa630a8efae
Author: huangtianhua <email address hidden>
Date: Tue Jul 26 10:58:33 2016 +0800

    Support condition for resource

    Support condition section in resource definition.

    Change-Id: Ic63debbf71c158e397ca3d9b9047eafdd598830b
    Blueprint: support-conditions-function
    Closes-Bug: #1605485

[Thomas Herve (therve)]

The merge doesn't seem to match the bug, was the reference incorrect in the commit message?

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/heat 7.0.0.0b3 development milestone.