ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

httpapi: Split off and save response text contents (#43305)

Browse source 
* Split off and save response text contents

* login might depend on httpapi
This commit is contained in:
Nathaniel Case 2018-07-26 10:12:34 -04:00 • committed by GitHub
parent 13dd1acbec
commit ab40c72a3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/plugins/connection/httpapi.py
View file

@ -206,12 +206,12 @@ class Connection(NetworkConnectionBase):
httpapi = httpapi_loader.get(self._network_os, self)
if httpapi:
display.vvvv('loaded API plugin for network_os %s' % self._network_os, host=self._play_context.remote_addr)
self._implementation_plugins.append(httpapi)
httpapi.set_become(self._play_context)
httpapi.login(self.get_option('remote_user'), self.get_option('password'))
display.vvvv('loaded API plugin for network_os %s' % self._network_os, host=self._play_context.remote_addr)
else:
raise AnsibleConnectionFailure('unable to load API plugin for network_os %s' % self._network_os)
self._implementation_plugins.append(httpapi)
cliconf = cliconf_loader.get(self._network_os, self)
if cliconf:
@ -258,7 +258,9 @@ class Connection(NetworkConnectionBase):
return self.send(path, data, **kwargs)
raise AnsibleConnectionFailure('Could not connect to {0}: {1}'.format(self._url, exc.reason))
# Try to assign a new auth token if one is given
self._auth = self.update_auth(response) or self._auth
response_text = response.read()
return response
# Try to assign a new auth token if one is given
self._auth = self.update_auth(response, response_text) or self._auth
return response, response_text