Merge pull request #5289 from rstrox/devel

rax: import novaclient.exceptions for cs.images.find
2013-12-17 14:04:05 -08:00 · 2013-12-17 14:04:05 -08:00 · 320d41149a
parent acf73bc336 038d030404
commit 320d41149a
1 changed files with 4 additions and 4 deletions
--- a/library/cloud/rax
+++ b/library/cloud/rax
@ -366,12 +366,12 @@ def cloudservers(module, state, name, flavor, image, meta, key_name, files,
        except ValueError:
            try:
                image = cs.images.find(human_id=image)
-            except (pyrax.exceptions.NotFound,
-                    pyrax.exceptions.NoUniqueMatch):
+            except(cs.exceptions.NotFound,
+                   cs.exceptions.NoUniqueMatch):
                try:
                    image = cs.images.find(name=image)
-                except (pyrax.exceptions.NotFound,
-                        pyrax.exceptions.NoUniqueMatch):
+                except (cs.exceptions.NotFound,
+                        cs.exceptions.NoUniqueMatch):
                    module.fail_json(msg='No matching image found (%s)' %
                                         image)