ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Change except Error when trying to get a missing option

Browse source
This commit is contained in:
Jordan Borean 2018-04-27 14:16:19 +10:00 committed by Brian Coca
parent efe7c20100
commit 25dea1f72c
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/action/__init__.py
View file

@ -236,11 +236,11 @@ class ActionBase(with_metaclass(ABCMeta, object)):
try: try:
admin_users = self._connection._shell.get_option('admin_users') + [remote_user] admin_users = self._connection._shell.get_option('admin_users') + [remote_user]
except KeyError: except AnsibleError:
admin_users = ['root', remote_user] # plugin does not support admin_users admin_users = ['root', remote_user] # plugin does not support admin_users
try: try:
remote_tmp = self._connection._shell.get_option('remote_tmp') remote_tmp = self._connection._shell.get_option('remote_tmp')
except KeyError: except AnsibleError:
remote_tmp = '~/ansible' remote_tmp = '~/ansible'
# deal with tmpdir creation # deal with tmpdir creation
@ -405,7 +405,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
try: try:
admin_users = self._connection._shell.get_option('admin_users') admin_users = self._connection._shell.get_option('admin_users')
except KeyError: except AnsibleError:
admin_users = ['root'] # plugin does not support admin users admin_users = ['root'] # plugin does not support admin users
if self._play_context.become and self._play_context.become_user and self._play_context.become_user not in admin_users + [remote_user]: if self._play_context.become and self._play_context.become_user and self._play_context.become_user not in admin_users + [remote_user]:

6
lib/ansible/plugins/shell/powershell.py
View file

@ -21,12 +21,6 @@ DOCUMENTATION = '''
key: remote_tmp key: remote_tmp
vars: vars:
- name: ansible_remote_tmp - name: ansible_remote_tmp
admin_users:
description:
- List of users to be expected to have admin privileges, this is unused
in the PowerShell plugin
type: list
default: []
set_module_language: set_module_language:
description: description:
- Controls if we set the locale for moduels when executing on the - Controls if we set the locale for moduels when executing on the