diff options
| -rw-r--r-- | heat/common/exception.py | 2 | ||||
| -rw-r--r-- | heat/engine/resources/aws/ec2/instance.py | 1 | ||||
| -rw-r--r-- | heat/engine/resources/openstack/nova/server.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/heat/common/exception.py b/heat/common/exception.py index 48faa10ba..401dad9b4 100644 --- a/heat/common/exception.py +++ b/heat/common/exception.py @@ -336,7 +336,7 @@ class ResourceFailure(HeatExceptionWithPath): path = res_path else: self.exc = None - res_failed = 'Resource %s failed: ' % action.upper() + res_failed = 'Resource %s failed: ' % self.action.upper() if res_failed in exception_or_error: (error, message, new_path) = self._from_status_reason( exception_or_error) diff --git a/heat/engine/resources/aws/ec2/instance.py b/heat/engine/resources/aws/ec2/instance.py index e35a5b3ad..7311eb995 100644 --- a/heat/engine/resources/aws/ec2/instance.py +++ b/heat/engine/resources/aws/ec2/instance.py @@ -558,6 +558,7 @@ class Instance(resource.Resource, sh.SchedulerHintsMixin): if server is not None: self.resource_id_set(server.id) + assert server is not None creator = progress.ServerCreateProgress(server.id) attachers = [] for vol_id, device in self.volumes(): diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py index 3815b7938..32cc84c6e 100644 --- a/heat/engine/resources/openstack/nova/server.py +++ b/heat/engine/resources/openstack/nova/server.py @@ -884,6 +884,7 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin, if server is not None: self.resource_id_set(server.id) + assert server is not None return server.id def check_create_complete(self, server_id): |