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)
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)
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.
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)
Reviewed: https:/ /review. openstack. org/128908 /git.openstack. org/cgit/ openstack/ heat/commit/ ?id=91c0e232998 2df57e9520c23cd a44930fa1b2cf4
Committed: https:/
Submitter: Jenkins
Branch: master
commit c06772571a81383 aa37336a78d72d4 55067b75e8
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 f2a5c32888f269b d1dc5e0e787467, before which LoadBalancers were
d32370233ea
behaving correctly.
Change-Id: I9c02ab3d3dfbee 0a8a90dd0ba345a 5acdaf8a610 e825ee660a4b20c 5947cc7e9a)
Closes-Bug: #1379619
(cherry picked from commit 7506d2c22fcd3d6
commit 5aa66555209eb5a 59abdb189b0a5d1 224e73b566
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 a3c99f63ba33734 a875353c8fc c32888f269bd1dc 5e0e787467)
Change-Id: If3d476f34b9e61
(cherry picked from commit d32370233eaf2a5
commit 6e1ad898d887514 267e3a429c291b2 a067ea7e03
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 8ddeffc568270d2 d3b51674323
Change-Id: I1de99702a385ac
commit 1e9b2cdd9004c5e 1fa3bb1a27830d7 5ebaebe20c
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 dleware. auth_token the heat-api will fail to start because middleware. auth_token.
keystonemid
there's duplicate options in keystoneclient.
Change-Id: I04573aa5ff967a fe3e00329f797fc c71b779e7b3
Closes-Bug: #1379082
commit 170069d540342ce d4dc3fdb3df6619 395dd56c6f
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: I9bd44857662e45 a1da2d4287017eb 966dea8276d 3f5c79fdcee57ad f5cfa3cc19)
Closes-bug: #1379072
(cherry picked from commit c73d607246b6bec
commit 8a1a58aee6cbeae ba0a333263c4b9f 544954b197
Author: Zane Bitter <email address hidden>
Date: Wed Oct 8 10:21:16 2014 -0400
Update translations for Juno
Change-Id: I9d429c042cc254 b7659dcc5a06be1 a645cc8bf06
commit 8b7fd4529b8d070 fa1a65412a3c493 c3013b5e30
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: Ib64da11ed5584c 1a2eef98378d320 1a6949fac7d 0b4d4a13cfae6c5 0ba7f85b79)
Closes-Bug: #1376900
(cherry picked from commit 75242b9c67aafa8
commit 9027ee5e8e9d997 6c29a47e4063b78 3a43ec2d04
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: Ie0fbe3ec3ab57a 2cb9dd5e551db15 285b2b423c0 4654a690c1e84a0 c9d40ed577)
Closes-Bug: #1376857
(cherry picked from commit 6f13c2d0a4ff200
commit 1eee0560548cafe 7ca7ee533f46dfb ae9a7681d2
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: Id5a28400bb8e27 a3b852f12d9af4c 2dc7c144725 799357457c3b1e8 bc0f9e87c5)
Closes-Bug: #1300336
(cherry picked from commit 8c54f483189fef2
commit ec09474b8dd9a1f ff0061af9c26b4f 52fdd297e3
Author: OpenStack Proposal Bot <email address hidden>
Date: Mon Oct 6 16:09:28 2014 +0000
Updated from global requirements
Change-Id: Ie4b40c04509a4a 6956760eb9ec59f d14e958b722