summaryrefslogtreecommitdiff
path: root/lib/ansible/errors
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2018-01-16 00:15:04 -0500
committerToshio Kuratomi <a.badger@gmail.com>2018-01-15 21:15:04 -0800
commitbbd6b8bb42cc8fa48157ce5db0efb0a836c94917 (patch)
tree47a5936d6204c746032dda20c59757c65dcec3d0 /lib/ansible/errors
parenteca3fcd214903595db4d4e2f06813b74f1511e85 (diff)
downloadansible-bbd6b8bb42cc8fa48157ce5db0efb0a836c94917.tar.gz
Temporary (#31677)
* allow shells to have per host options, remote_tmp added language to shell removed module lang setting from general as plugins have it now use get to avoid bad powershell plugin more resilient tmp discovery, fall back to `pwd` add shell to docs fixed options for when frags are only options added shell set ops in t_e and fixed option frags normalize tmp dir usag4e - pass tmpdir/tmp/temp options as env var to commands, making it default for tempfile - adjusted ansiballz tmpdir - default local tempfile usage to the configured local tmp - set env temp in action add options to powershell shift temporary to internal envvar/params ensure tempdir is set if we pass var ensure basic and url use expected tempdir ensure localhost uses local tmp give /var/tmp priority, less perms issues more consistent tempfile mgmt for ansiballz made async_dir configurable better action handling, allow for finally rm tmp fixed tmp issue and no more tempdir in ballz hostvarize world readable and admin users always set shell tempdir added comment to discourage use of exception/flow control * Mostly revert expand_user as it's not quite working. This was an additional feature anyhow. Kept the use of pwd as a fallback but moved it to a second ssh connection. This is not optimal but getting that to work in a single ssh connection was part of the problem holding this up. (cherry picked from commit 395b714120522f15e4c90a346f5e8e8d79213aca) * fixed script and other action plugins ensure tmpdir deletion allow for connections that don't support new options (legacy, 3rd party) fixed tests
Diffstat (limited to 'lib/ansible/errors')
-rw-r--r--lib/ansible/errors/__init__.py33
1 files changed, 30 insertions, 3 deletions
diff --git a/lib/ansible/errors/__init__.py b/lib/ansible/errors/__init__.py
index 1a971f8900..73dd4d0c3e 100644
--- a/lib/ansible/errors/__init__.py
+++ b/lib/ansible/errors/__init__.py
@@ -252,11 +252,38 @@ class AnsibleFileNotFound(AnsibleRuntimeError):
suppress_extended_error=suppress_extended_error, orig_exc=orig_exc)
-class AnsibleActionSkip(AnsibleRuntimeError):
+# These Exceptions are temporary, using them as flow control until we can get a better solution.
+# DO NOT USE as they will probably be removed soon.
+class AnsibleAction(AnsibleRuntimeError):
+ ''' Base Exception for Action plugin flow control '''
+
+ def __init__(self, message="", obj=None, show_content=True, suppress_extended_error=False, orig_exc=None, result=None):
+
+ super(AnsibleAction, self).__init__(message=message, obj=obj, show_content=show_content,
+ suppress_extended_error=suppress_extended_error, orig_exc=orig_exc)
+ if result is None:
+ self.result = {}
+ else:
+ self.result = result
+
+
+class AnsibleActionSkip(AnsibleAction):
''' an action runtime skip'''
- pass
+
+ def __init__(self, message="", obj=None, show_content=True, suppress_extended_error=False, orig_exc=None, result=None):
+ super(AnsibleActionSkip, self).__init__(message=message, obj=obj, show_content=show_content,
+ suppress_extended_error=suppress_extended_error, orig_exc=orig_exc, result=result)
+ self.result.update({'skipped': True, 'msg': message})
-class AnsibleActionFail(AnsibleRuntimeError):
+class AnsibleActionFail(AnsibleAction):
''' an action runtime failure'''
+ def __init__(self, message="", obj=None, show_content=True, suppress_extended_error=False, orig_exc=None, result=None):
+ super(AnsibleActionFail, self).__init__(message=message, obj=obj, show_content=show_content,
+ suppress_extended_error=suppress_extended_error, orig_exc=orig_exc, result=result)
+ self.result.update({'failed': True, 'msg': message})
+
+
+class AnsibleActionDone(AnsibleAction):
+ ''' an action runtime early exit'''
pass