sys.exit removal for cloud/xenserver_facts.py
This commit is contained in:
parent
766ad0ace2
commit
950c951e06
1 changed files with 7 additions and 9 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue