diff options
| author | Ethan Lynn <xjunlin@cn.ibm.com> | 2015-04-02 23:40:17 +0800 |
|---|---|---|
| committer | Ethan Lynn <xjunlin@cn.ibm.com> | 2015-04-02 23:40:17 +0800 |
| commit | 189324a7094dc84d8b8206df38e754ae07daf1e4 (patch) | |
| tree | e69982a45751da1ecfe6661208788b7539164785 /heat/engine | |
| parent | f65079fe74b82efe3662b13cdc4c61e25639b625 (diff) | |
| download | heat-189324a7094dc84d8b8206df38e754ae07daf1e4.tar.gz | |
Fix stack update issue
Different type of resource with same name should consider to be a
new resource when stack-update.
Change-Id: I102ffbd1a1562c164f43969c87570096c280738a
Closes-Bug: #1404201
Diffstat (limited to 'heat/engine')
| -rw-r--r-- | heat/engine/update.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/heat/engine/update.py b/heat/engine/update.py index 4683223ca..67d4fda83 100644 --- a/heat/engine/update.py +++ b/heat/engine/update.py @@ -124,8 +124,10 @@ class StackUpdate(object): @scheduler.wrappertask def _process_new_resource_update(self, new_res): res_name = new_res.name + res_type = new_res.type() - if res_name in self.existing_stack: + if (res_name in self.existing_stack and + res_type == self.existing_stack[res_name].type()): existing_res = self.existing_stack[res_name] try: yield self._update_in_place(existing_res, |