Skip to content

Commit

Permalink
fix spurious warnings with ansible_winrm_kinit_X args (ansible#24380)
Browse files Browse the repository at this point in the history
* added to pywinrm arg whitelist
* clarified error text on kinit_mode error
* fixes ansible#23822
  • Loading branch information
nitzmahone authored and KKoukiou committed May 22, 2017
1 parent f172d85 commit 1950568
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/ansible/plugins/connection/winrm.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ def set_host_overrides(self, host, hostvars=None):
elif kinit_mode == "manual":
self._kerb_managed = False
else:
raise AnsibleError('Unknown ansible_winrm_kinit_mode value: %s' % kinit_mode)
raise AnsibleError('Unknown ansible_winrm_kinit_mode value: "%s" (must be "managed" or "manual")' % kinit_mode)

# arg names we're going passing directly
internal_kwarg_mask = set(['self', 'endpoint', 'transport', 'username', 'password', 'scheme', 'path'])
internal_kwarg_mask = set(['self', 'endpoint', 'transport', 'username', 'password', 'scheme', 'path', 'kinit_mode', 'kinit_cmd'])

self._winrm_kwargs = dict(username=self._winrm_user, password=self._winrm_pass)
argspec = inspect.getargspec(Protocol.__init__)
Expand Down

0 comments on commit 1950568

Please sign in to comment.