summaryrefslogtreecommitdiff
path: root/cloud/xenserver_facts.py
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2015-10-05 13:22:32 -0500
committerMatt Martz <matt@sivel.net>2015-10-05 13:22:32 -0500
commitb82ebdde19ae5b721778456cadc5594d699ceb3a (patch)
tree21a5ab40f87053279e2613138592b2d2fab3c1e4 /cloud/xenserver_facts.py
parentd89ca8cc01df62d931325899ad6d30bc4ea2a004 (diff)
downloadansible-modules-extras-b82ebdde19ae5b721778456cadc5594d699ceb3a.tar.gz
sys.exit removal for cloud/xenserver_facts.py
Diffstat (limited to 'cloud/xenserver_facts.py')
-rw-r--r--cloud/xenserver_facts.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/cloud/xenserver_facts.py b/cloud/xenserver_facts.py
index 14903092..d679afce 100644
--- a/cloud/xenserver_facts.py
+++ b/cloud/xenserver_facts.py
@@ -28,7 +28,6 @@ author:
'''
import platform
-import sys
import XenAPI
EXAMPLES = '''
@@ -75,12 +74,9 @@ class XenServerFacts:
def get_xenapi_session():
- try:
- session = XenAPI.xapi_local()
- session.xenapi.login_with_password('', '')
- return session
- except XenAPI.Failure:
- sys.exit(1)
+ session = XenAPI.xapi_local()
+ session.xenapi.login_with_password('', '')
+ return session
def get_networks(session):
@@ -163,8 +159,10 @@ def main():
module = AnsibleModule({})
obj = XenServerFacts()
- session = get_xenapi_session()
-
+ try:
+ session = get_xenapi_session()
+ except XenAPI.Failure, e:
+ module.fail_json(msg='%s' % e)
data = {
'xenserver_version': obj.version,