From 369b7faee736119b6ea8107bce0dac381ed9e613 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 22 May 2013 16:34:32 +0100 Subject: [PATCH] Instance resource remove unreachable/redundant Metadata update check update_template_diff already throws resource.UpdateReplace if the json_snippet contains changes other than to Metadata, so the else here is unreachable and redundant Change-Id: I9f0ad88d0b6fa65cafd5b2843a38913fa843a3ac --- heat/engine/resources/instance.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index 198f04f0..2c9b85f1 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -388,11 +388,8 @@ class Instance(resource.Resource): def handle_update(self, json_snippet): tmpl_diff = self.update_template_diff(json_snippet) - for k in tmpl_diff: - if k == 'Metadata': - self.metadata = json_snippet.get('Metadata', {}) - else: - raise resource.UpdateReplace(resource_name=self.name) + if 'Metadata' in tmpl_diff: + self.metadata = tmpl_diff.get('Metadata', {}) def metadata_update(self, new_metadata=None): ''' -- 2.45.2