diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-27 23:36:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-27 23:36:06 +0000 |
| commit | 27375855e86da65ba2c8452ad44f59f8fb352859 (patch) | |
| tree | cc396d030797c62745441e9361358a2ee0dbf4de | |
| parent | 329f9fdc2bd6b023d63ffb2ec3ca2ed245984501 (diff) | |
| parent | bb05b189d175c0e590074646d661981a40c0bb28 (diff) | |
| download | ironic-27375855e86da65ba2c8452ad44f59f8fb352859.tar.gz | |
Merge "Raise unexpected exceptions during destroy()"
| -rw-r--r-- | ironic/nova/virt/ironic/driver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ironic/nova/virt/ironic/driver.py b/ironic/nova/virt/ironic/driver.py index 1976c7f6b..9cee7ccde 100644 --- a/ironic/nova/virt/ironic/driver.py +++ b/ironic/nova/virt/ironic/driver.py @@ -500,8 +500,10 @@ class IronicDriver(virt_driver.ComputeDriver): # This should be fixed in Ironic. # TODO(deva): This exception should be added to python-ironicclient # and matched directly, rather than via __name__. - if e.__name__ == 'InstanceDeployFailure': + if getattr(e, '__name__', None) == 'InstanceDeployFailure': pass + else: + raise def _wait_for_provision_state(): try: |