diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-12-10 12:34:21 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-12-10 12:34:21 +0000 |
commit | 1bed7a3732e7d6158613609a57fb1f77ec99de1e (patch) | |
tree | e34a440a0ed94629dbce5a12e6b528f184e5684c /morphlib/exts | |
parent | 5ef4b3e74d607181090db6d7e06cc2e960b4d062 (diff) | |
parent | a052d7a7e0d54522512c8c3f4fc4bcf7e47a029c (diff) | |
download | morph-1bed7a3732e7d6158613609a57fb1f77ec99de1e.tar.gz |
Merge branch 'sam/fix-openstack-credentials-check'
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Diffstat (limited to 'morphlib/exts')
-rwxr-xr-x | morphlib/exts/openstack.check | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/morphlib/exts/openstack.check b/morphlib/exts/openstack.check index edc37cc1..a6856c31 100755 --- a/morphlib/exts/openstack.check +++ b/morphlib/exts/openstack.check @@ -77,9 +77,16 @@ class OpenStackCheckExtension(morphlib.writeexts.WriteExtension): '--os-password', password, '--os-auth-url', auth_url, 'image-list'] - try: - cliapp.runcmd(cmdline) - except cliapp.AppException: - raise cliapp.AppException('Wrong OpenStack credentals.') + + exit, out, err = cliapp.runcmd_unchecked(cmdline) + + if exit != 0: + if err.startswith('The request you have made requires ' \ + 'authentication. (HTTP 401)'): + raise cliapp.AppException('Invalid OpenStack credentials.') + else: + raise cliapp.AppException( + 'Failed to connect to OpenStack instance at %s: %s' % + (auth_url, err)) OpenStackCheckExtension().run() |