mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-22 12:50:22 -07:00
standardize connection variable names (#51776)
* standardize user/password connection vars * docs: use ansible_user and ansible_password * docs: var precedence for connection vars * docs: ansible_become_pass -> ansible_become_password etc
This commit is contained in:
parent
51061f8a5f
commit
953058d025
35 changed files with 120 additions and 93 deletions
|
@ -184,13 +184,13 @@ class ConnectionBase(AnsiblePlugin):
|
|||
processed on the remote machine, not on the local machine so no
|
||||
shell is needed on the local machine. (Example, ``/bin/sh``)
|
||||
:ConnectionCommand: This is the command that connects us to the remote
|
||||
machine to run the rest of the command. ``ansible_ssh_user``,
|
||||
machine to run the rest of the command. ``ansible_user``,
|
||||
``ansible_ssh_host`` and so forth are fed to this piece of the
|
||||
command to connect to the correct host (Examples ``ssh``,
|
||||
``chroot``)
|
||||
:UsersLoginShell: This shell may or may not be created depending on
|
||||
the ConnectionCommand used by the connection plugin. This is the
|
||||
shell that the ``ansible_ssh_user`` has configured as their login
|
||||
shell that the ``ansible_user`` has configured as their login
|
||||
shell. In traditional UNIX parlance, this is the last field of
|
||||
a user's ``/etc/passwd`` entry We do not specifically try to run
|
||||
the ``UsersLoginShell`` when we connect. Instead it is implicit
|
||||
|
|
|
@ -61,6 +61,7 @@ options:
|
|||
vars:
|
||||
- name: ansible_password
|
||||
- name: ansible_httpapi_pass
|
||||
- name: ansible_httpapi_password
|
||||
use_ssl:
|
||||
type: boolean
|
||||
description:
|
||||
|
|
|
@ -103,6 +103,7 @@ DOCUMENTATION = """
|
|||
default: ''
|
||||
vars:
|
||||
- name: ansible_kubectl_username
|
||||
- name: ansible_kubectl_user
|
||||
env:
|
||||
- name: K8S_AUTH_USERNAME
|
||||
kubectl_password:
|
||||
|
|
|
@ -66,6 +66,7 @@ options:
|
|||
vars:
|
||||
- name: ansible_password
|
||||
- name: ansible_ssh_pass
|
||||
- name: ansible_ssh_password
|
||||
private_key_file:
|
||||
description:
|
||||
- The private SSH key or certificate file used to authenticate to the
|
||||
|
|
|
@ -67,6 +67,8 @@ options:
|
|||
vars:
|
||||
- name: ansible_password
|
||||
- name: ansible_ssh_pass
|
||||
- name: ansible_ssh_password
|
||||
- name: ansible_netconf_password
|
||||
private_key_file:
|
||||
description:
|
||||
- The private SSH key or certificate file used to authenticate to the
|
||||
|
|
|
@ -63,6 +63,7 @@ options:
|
|||
vars:
|
||||
- name: ansible_password
|
||||
- name: ansible_ssh_pass
|
||||
- name: ansible_ssh_password
|
||||
private_key_file:
|
||||
description:
|
||||
- The private SSH key or certificate file used to authenticate to the
|
||||
|
|
|
@ -51,7 +51,9 @@ DOCUMENTATION = """
|
|||
vars:
|
||||
- name: ansible_password
|
||||
- name: ansible_ssh_pass
|
||||
- name: ansible_ssh_password
|
||||
- name: ansible_paramiko_pass
|
||||
- name: ansible_paramiko_password
|
||||
version_added: '2.5'
|
||||
host_key_auto_add:
|
||||
description: 'TODO: write it'
|
||||
|
|
|
@ -47,6 +47,7 @@ DOCUMENTATION = '''
|
|||
vars:
|
||||
- name: ansible_password
|
||||
- name: ansible_ssh_pass
|
||||
- name: ansible_ssh_password
|
||||
ssh_args:
|
||||
description: Arguments to pass to all ssh cli tools
|
||||
default: '-C -o ControlMaster=auto -o ControlPersist=60s'
|
||||
|
@ -605,7 +606,7 @@ class Connection(ConnectionBase):
|
|||
b"-o", b"PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey",
|
||||
b"-o", b"PasswordAuthentication=no"
|
||||
),
|
||||
u"ansible_password/ansible_ssh_pass not set"
|
||||
u"ansible_password/ansible_ssh_password not set"
|
||||
)
|
||||
|
||||
user = self._play_context.remote_user
|
||||
|
@ -924,7 +925,7 @@ class Connection(ConnectionBase):
|
|||
|
||||
if states[state] == 'awaiting_prompt':
|
||||
if self._flags['become_prompt']:
|
||||
display.debug('Sending become_pass in response to prompt')
|
||||
display.debug('Sending become_password in response to prompt')
|
||||
stdin.write(to_bytes(self._play_context.become_pass) + b'\n')
|
||||
# On python3 stdin is a BufferedWriter, and we don't have a guarantee
|
||||
# that the write will happen without a flush
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue