ValueError: No content found in the "files" section for get_file path when restore

[huangtianhua]

1. create a stack with template:
**********************
heat_template_version: 2015-04-30
parameters:
  name:
    type: string
    default: tgf
resources:
 hth_server:
    type: OS::Nova::Server
    properties:
      image: cirros-0.3.4-x86_64-uec
      networks: [{network: 4e8af0b3-e99d-421e-9655-3ba998ca3bdf}]
      flavor: 1
      name: {get_param: name}
      user_data: {get_file: userdata.sh}
***********************
2. snapshot for stack
3. stack-restore, and then a ValueError raised : No content found in the "files" section for get_file path: file:///usr/hth/userdata.sh,
    the details see: http://paste.openstack.org/show/258178/

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 8140409e6345d76fbfb0d433c263826eaff4860a
Author: huangtianhua <email address hidden>
Date: Wed Jun 3 14:47:55 2015 +0800

    Inherit files when restore

    We use stack.prepare_abandon() to make the
    snapshot data, but the data have no 'files' then will
    result in ValueError raised(No content found in the "files"
    section for get_file path) when restore.
    This patch will store 'files' for snapshot data(
    also for prepare abandon data), then we can get 'files'
    from the snapshot data when stack restore.

    Change-Id: I0fddf92e950b93dce70eb8e5a562cf8d0046a9ab
    Closes-Bug: #1461375

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/kilo
Review: https://review.openstack.org/224971

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/224971
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=aeba790e149cb8e6a0442dc28db92991fd1718f3
Submitter: Jenkins
Branch: stable/kilo

commit aeba790e149cb8e6a0442dc28db92991fd1718f3
Author: huangtianhua <email address hidden>
Date: Wed Jun 3 14:47:55 2015 +0800

    Inherit files when restore

    We use stack.prepare_abandon() to make the
    snapshot data, but the data have no 'files' then will
    result in ValueError raised(No content found in the "files"
    section for get_file path) when restore.
    This patch will store 'files' for snapshot data(
    also for prepare abandon data), then we can get 'files'
    from the snapshot data when stack restore.

    Closes-Bug: #1461375
    (cherry picked from commit 8140409e6345d76fbfb0d433c263826eaff4860a)

    Conflicts:
     heat/tests/engine/test_stack_snapshot.py
     heat/tests/test_server.py

    Change-Id: I0fddf92e950b93dce70eb8e5a562cf8d0046a9ab