summaryrefslogtreecommitdiff
path: root/lib/ansible/plugins/lookup/url.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/plugins/lookup/url.py')
-rw-r--r--lib/ansible/plugins/lookup/url.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ansible/plugins/lookup/url.py b/lib/ansible/plugins/lookup/url.py
index 6790e1ce..f5c93f28 100644
--- a/lib/ansible/plugins/lookup/url.py
+++ b/lib/ansible/plugins/lookup/url.py
@@ -64,7 +64,7 @@ options:
- section: url_lookup
key: timeout
http_agent:
- description: User-Agent to use in the request. The default was changed in 2.11 to C(ansible-httpget).
+ description: User-Agent to use in the request. The default was changed in 2.11 to V(ansible-httpget).
type: string
version_added: "2.10"
default: ansible-httpget
@@ -81,12 +81,12 @@ options:
version_added: "2.10"
default: False
vars:
- - name: ansible_lookup_url_agent
+ - name: ansible_lookup_url_force_basic_auth
env:
- - name: ANSIBLE_LOOKUP_URL_AGENT
+ - name: ANSIBLE_LOOKUP_URL_FORCE_BASIC_AUTH
ini:
- section: url_lookup
- key: agent
+ key: force_basic_auth
follow_redirects:
description: String of urllib2, all/yes, safe, none to determine how redirects are followed, see RedirectHandlerFactory for more information
type: string
@@ -102,7 +102,7 @@ options:
use_gssapi:
description:
- Use GSSAPI handler of requests
- - As of Ansible 2.11, GSSAPI credentials can be specified with I(username) and I(password).
+ - As of Ansible 2.11, GSSAPI credentials can be specified with O(username) and O(password).
type: boolean
version_added: "2.10"
default: False
@@ -211,7 +211,7 @@ RETURN = """
from urllib.error import HTTPError, URLError
from ansible.errors import AnsibleError
-from ansible.module_utils._text import to_text, to_native
+from ansible.module_utils.common.text.converters import to_text, to_native
from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError
from ansible.plugins.lookup import LookupBase
from ansible.utils.display import Display