Stack adopt requires template

[Steven Hardy]

1. When you abandon a stack, the abandon data contains the template, but on adopt we ignore this, and require the user to pass it as well as the adopt data.
2. On stack-abandon, parameters info is not included in abandon data

heat stack-abandon r2
{
  "status": "COMPLETE",
  "name": "r2",
  "template": {
    "outputs": {
      "name": {
        "description": "name",
        "value": {
          "get_attr": [
            "random",
            "value"
          ]
        }
      }
    },
    "heat_template_version": "2013-05-23",
    "resources": {
      "random": {
        "type": "OS::Heat::RandomString"
      }
    }
  },
  "action": "ADOPT",
  "id": "c6db9b44-b874-4c21-8344-c5d98e143015",
  "resources": {
    "random": {
      "status": "COMPLETE",
      "name": "random",
      "resource_data": {
        "value": "FSnNpirfiUovg7l4LMDPE4xAJsG2TA1W"
      },
      "resource_id": "FSnNpirfiUovg7l4LMDPE4xAJsG2TA1W",
      "action": "ADOPT",
      "type": "OS::Heat::RandomString",
      "metadata": {}
    }
  }
}

[Clint Byrum (clint-fewbar)]

I hit this one too.. totally forgot to report it. ;)

[Steven Hardy (shardy)]

Also the abandon data doesn't include the environment or parameters, so an adopted stack will fail updates when https://bugs.launchpad.net/heat/+bug/1224828 gets implemented and passing them isn't mandatory.

[Vijendar Komalla (vijendar-komalla)]

1. Stack adopt does not need a template (make changes to the python-heatclient)
2. On stack abandon include the environment and parameters info in the abandon data

Shardy/Client, is my above understanding correct?

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/112044
Committed: https://git.openstack.org/cgit/openstack/python-heatclient/commit/?id=a34f105ce1096dbdd35568f2289119fefd686701
Submitter: Jenkins
Branch: master

commit a34f105ce1096dbdd35568f2289119fefd686701
Author: Vijendar Komalla <email address hidden>
Date: Tue Aug 5 10:08:24 2014 -0500

    Template is not required on stack-adopt

    stack-adopt does not require a template, so removing template
    parameters passed to stack-adopt.

    Change-Id: I713fba392b8b8bbebf2f0c9d9be220e5826bf993
    Closes-Bug: #1300336

[OpenStack Infra (hudson-openstack)]

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

commit f11bbaf07a03fa8db3ad8c683ddf3f8ef802651d
Author: Vijendar Komalla <email address hidden>
Date: Wed Sep 3 11:57:11 2014 -0500

    Include parameters info in stack-abandon data

    Currently on stack-adopt parameters from the original stack are
    not adopted. With this change stack abandon data includes parameters
    info and that data will be used on stack-adopt.

    Change-Id: I59310200d124655b423f01c8672df4217f0f68e7
    Partial-Bug: #1300336

[OpenStack Infra (hudson-openstack)]

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

commit 8c54f483189fef2799357457c3b1e8bc0f9e87c5
Author: Vijendar Komalla <email address hidden>
Date: Tue Sep 30 13:38:52 2014 -0500

    Template not required on stack-adopt

    With this change, template is not required on stack-adopt and
    also parameters from the original stack are adopted.

    Change-Id: Id5a28400bb8e27a3b852f12d9af4c2dc7c144725
    Closes-Bug: #1300336

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/126917
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=1eee0560548cafe7ca7ee533f46dfbae9a7681d2
Submitter: Jenkins
Branch: proposed/juno

commit 1eee0560548cafe7ca7ee533f46dfbae9a7681d2
Author: Vijendar Komalla <email address hidden>
Date: Tue Sep 30 13:38:52 2014 -0500

    Template not required on stack-adopt

    With this change, template is not required on stack-adopt and
    also parameters from the original stack are adopted.

    Change-Id: Id5a28400bb8e27a3b852f12d9af4c2dc7c144725
    Closes-Bug: #1300336
    (cherry picked from commit 8c54f483189fef2799357457c3b1e8bc0f9e87c5)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit c06772571a81383aa37336a78d72d455067b75e8
Author: Zane Bitter <email address hidden>
Date: Fri Oct 10 15:43:16 2014 -0400

    Don't update a LoadBalancer under autoscaling control

    Unfortunately, Autoscaling currently uses the update() method of a
    LoadBalancer resource to do updates, with the result that the current
    member list gets persisted (good) and used to compare in the event of
    future *stack* updates (bad).

    With this patch, we assume that LoadBalancers under the control of
    Autoscaling will never have a members list property supplied in the
    template. We then ignore any updates to Autoscaling LoadBalancers that
    don't actually modify the template.

    The test changes revert the changes made in order to be able to merge
    d32370233eaf2a5c32888f269bd1dc5e0e787467, before which LoadBalancers were
    behaving correctly.

    Change-Id: I9c02ab3d3dfbee0a8a90dd0ba345a5acdaf8a610
    Closes-Bug: #1379619
    (cherry picked from commit 7506d2c22fcd3d6e825ee660a4b20c5947cc7e9a)

commit 5aa66555209eb5a59abdb189b0a5d1224e73b566
Author: Angus Salkeld <email address hidden>
Date: Fri Oct 10 12:00:37 2014 +1000

    Make sure that the properties are stored on updates

    Previously properties_data was only stored on creation, now
    this is getting passed to the update mechanism too.
    Later we can look at reworking this into a single mechanism.

    Closes-bug: #1377681
    Change-Id: If3d476f34b9e61a3c99f63ba33734a875353c8fc
    (cherry picked from commit d32370233eaf2a5c32888f269bd1dc5e0e787467)

commit 6e1ad898d887514267e3a429c291b2a067ea7e03
Author: huangtianhua <email address hidden>
Date: Wed Sep 24 15:19:24 2014 +0800

    Do not attempt a stack update when it is deleting

    If a stack is in any delete state(inprogress, failed),
    don't attempt to update it.

    Closes-bug: #1379113
    Change-Id: I1de99702a385ac8ddeffc568270d2d3b51674323

commit 1e9b2cdd9004c5e1fa3bb1a27830d75ebaebe20c
Author: Brant Knudson <email address hidden>
Date: Wed Oct 8 20:15:54 2014 -0500

    Update references to auth_token middleware

    There's references to the auth_token middleware in keystoncelient.
    The auth_token middleware has been moved to keystonemiddleware and
    the version in keystoneclient shouldn't be used anymore.

    If these references aren't updated, then when options are changed in
    keystonemiddleware.auth_token the heat-api will fail to start because
    there's duplicate options in keystoneclient.middleware.auth_token.

    Change-Id: I04573aa5ff967afe3e00329f797fcc71b779e7b3
    Closes-Bug: #1379082

commit 170069d540342ced4dc3fdb3df6619395dd56c6f
Author: Angus Salkeld <email address hidden>
Date: Thu Oct 9 15:35:34 2014 +1000

    Add missing extra "greenthread" arg to remove_event()

    See: http://eventlet.net/doc/modules/greenthread.html
    the callback gets passed a "gt" arg.

    Change-Id: I9bd44857662e45a1da2d4287017e...