Comment 11 for bug 1379072

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to heat (master)

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: I9bd44857662e45a1da2d4287017eb966dea8276d
    Closes-bug: #1379072
    (cherry picked from commit c73d607246b6bec3f5c79fdcee57adf5cfa3cc19)

commit 8a1a58aee6cbeaeba0a333263c4b9f544954b197
Author: Zane Bitter <email address hidden>
Date: Wed Oct 8 10:21:16 2014 -0400

    Update translations for Juno

    Change-Id: I9d429c042cc254b7659dcc5a06be1a645cc8bf06

commit 8b7fd4529b8d070fa1a65412a3c493c3013b5e30
Author: Zane Bitter <email address hidden>
Date: Fri Oct 3 14:22:10 2014 -0400

    Don't send multiple update-cancel messages to an event

    Change-Id: Ib64da11ed5584c1a2eef98378d3201a6949fac7d
    Closes-Bug: #1376900
    (cherry picked from commit 75242b9c67aafa80b4d4a13cfae6c50ba7f85b79)

commit 9027ee5e8e9d9976c29a47e4063b783a43ec2d04
Author: Zane Bitter <email address hidden>
Date: Fri Oct 3 14:22:10 2014 -0400

    Clean up signalling events after stack updates

    We provide an Event object to every stack update in order to signal it that
    we need to cancel the update; this change ensures that we delete it when
    the thread is complete. Previously we were leaking memory on every update.

    Change-Id: Ie0fbe3ec3ab57a2cb9dd5e551db15285b2b423c0
    Closes-Bug: #1376857
    (cherry picked from commit 6f13c2d0a4ff2004654a690c1e84a0c9d40ed577)

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)

commit ec09474b8dd9a1fff0061af9c26b4f52fdd297e3
Author: OpenStack Proposal Bot <email address hidden>
Date: Mon Oct 6 16:09:28 2014 +0000

    Updated from global requirements

    Change-Id: Ie4b40c04509a4a6956760eb9ec59fd14e958b722