valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix glassfish when test=true and AS server down

Browse Source
This commit is contained in:
Jason Fagnere 2017-05-18 14:23:36 +02:00
parent 529dbbe6bb
commit c370c659d4
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/states/glassfish.py
View File

@ -20,6 +20,7 @@ try:
import json
from salt.ext import six
from salt.exceptions import CommandExecutionError
import requests
HAS_LIBS = True
except ImportError:
HAS_LIBS = False
@ -74,7 +75,16 @@ def _do_element_present(name, elem_type, data, server=None):
Generic function to create or update an element
'''
ret = {'changes': {}, 'update': False, 'create': False, 'error': None}
elements = __salt__['glassfish.enum_{0}'.format(elem_type)]()
try:
elements = __salt__['glassfish.enum_{0}'.format(elem_type)]()
except requests.ConnectionError as error:
if __opts__['test']:
ret['changes'] = {'Name': name, 'Params': data}
ret['create'] = True
return ret
else:
ret['error'] = "Can't connect to the server"
return ret
if not elements or name not in elements:
ret['changes'] = {'Name': name, 'Params': data}
@ -104,7 +114,15 @@ def _do_element_absent(name, elem_type, data, server=None):
Generic function to delete an element
'''
ret = {'delete': False, 'error': None}
elements = __salt__['glassfish.enum_{0}'.format(elem_type)]()
try:
elements = __salt__['glassfish.enum_{0}'.format(elem_type)]()
except requests.ConnectionError as error:
if __opts__['test']:
ret['create'] = True
return ret
else:
ret['error'] = "Can't connect to the server"
return ret
if elements and name in elements:
ret['delete'] = True