Commit Graph

156 Commits (99c6f77e593a36ac26341d77fddd898665bde3ae)

Author SHA1 Message Date
Abhijit Menon-Sen 3ad9b4cba6 Rework additional ssh argument handling
Now we have the following ways to set additional arguments:

1. [ssh_connection]ssh_args in ansible.cfg: global setting, prepended to
   every command line for ssh/scp/sftp. Overrides default ControlPersist
   settings.
2. ansible_ssh_common_args inventory variable. Appended to every command
   line for ssh/scp/sftp. Used in addition to ssh_args, if set above, or
   the default settings.
3. ansible_{sftp,scp,ssh}_extra_args inventory variables. Appended to
   every command line for the relevant binary only. Used in addition to
   #1 and #2, if set above, or the default settings.
3. Using the --ssh-common-args or --{sftp,scp,ssh}-extra-args command
   line options (which are overriden by #2 and #3 above).

This preserves backwards compatibility (for ssh_args in ansible.cfg),
but also permits global settings (e.g. ProxyCommand via _common_args) or
ssh-specific options (e.g. -R via ssh_extra_args).

Fixes #12576
9 years ago
James Cammarata 6650ba7654 Squashed commit of the following:
commit 9921bb9d20
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Mon Aug 10 20:19:44 2015 +0530

    Document --ssh-extra-args command-line option

commit 8b25595e7b
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Thu Aug 13 13:24:57 2015 +0530

    Don't disable GSSAPI/Pubkey authentication when using --ask-pass

    This commit is based on a bug report and PR by kolbyjack (#6846) which
    was subsequently closed and rebased as #11690. The original problem was:

        «The password on the delegated host is different from the one I
        provided on the command line, so it had to use the pubkey, and the
        main host doesn't have a pubkey on it yet, so it had to use the
        password.»

    (This commit is revised and included here because #11690 would conflict
    with the changes in #11908 otherwise.)

    Closes #11690

commit 119d032389
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Thu Aug 13 11:16:42 2015 +0530

    Be more explicit about why SSH arguments are added

    This adds vvvvv log messages that spell out in detail where each SSH
    command-line argument is obtained from.

    Unfortunately, we can't be sure if, say, self._play_context.remote_user
    is obtained from ANSIBLE_REMOTE_USER in the environment, remote_user in
    ansible.cfg, -u on the command line, or an ansible_ssh_user setting in
    the inventory or on a task or play. In some cases, e.g. timeout, we
    can't even be sure if it was set by the user or just a default.

    Nevertheless, on the theory that at five v's you can use all the hints
    available, I've mentioned the possible sources in the log messages.

    Note that this caveat applies only to the arguments that ssh.py adds by
    itself. In the case of ssh_args and ssh_extra_args, we know where they
    are from, and say so, though we can't say WHERE in the inventory they
    may be set (e.g. in host_vars or group_vars etc.).

commit b605c285ba
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Tue Aug 11 15:19:43 2015 +0530

    Add a FAQ entry about ansible_ssh_extra_args

commit 49f8edd035
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Mon Aug 10 20:48:50 2015 +0530

    Allow ansible_ssh_args to be set as an inventory variable

    Before this change, ssh_args could be set only in the [ssh_connection]
    section of ansible.cfg, and was applied to all hosts. Now it's possible
    to set ansible_ssh_args as an inventory variable (directly, or through
    group_vars or host_vars) to selectively override the global setting.

    Note that the default ControlPath settings are applied only if ssh_args
    is not set, and this is true of ansible_ssh_args as well. So if you want
    to override ssh_args but continue to set ControlPath, you'll need to
    repeat the appropriate options when setting ansible_ssh_args.

    (If you only need to add options to the default ssh_args, you may be
    able to use the ansible_ssh_extra_args inventory variable instead.)

commit 37c1a5b679
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Mon Aug 10 19:42:30 2015 +0530

    Allow overriding ansible_ssh_extra_args on the command-line

    This patch makes it possible to do:

        ansible somehost -m setup \
            --ssh-extra-args '-o ProxyCommand="ssh -W %h:%p -q user@bouncer.example.com"'

    This overrides the inventory setting, if any, of ansible_ssh_extra_args.

    Based on a patch originally by @Richard2ndQuadrant.

commit b023ace8a8
Author: Abhijit Menon-Sen <ams@2ndQuadrant.com>
Date:   Mon Aug 10 19:06:19 2015 +0530

    Add an ansible_ssh_extra_args inventory variable

    This can be used to configure a per-host or per-group ProxyCommand to
    connect to hosts through a jumphost, e.g.:

        inventory:
            [gatewayed]
            foo ansible_ssh_host=192.0.2.1

        group_vars/gatewayed.yml:
            ansible_ssh_extra_args: '-o ProxyCommand="ssh -W %h:%p -q bounceuser@gateway.example.com"'

    Note that this variable is used in addition to any ssh_args configured
    in the [ssh_connection] section of ansible.cfg (so you don't need to
    repeat the ControlPath settings in ansible_ssh_extra_args).
9 years ago
Abhijit Menon-Sen 4afe1cf422 Update ansible-vault manpage to describe new encrypt/decrypt behaviour 9 years ago
Richard Poole 3090a45891 add option to ansible-vault to read new password from file for rekey
The --new-vault-password-file option works the same as
--vault-password-file but applies only to rekeying (when
--vault-password-file sets the old password). Also update the manpage
to document these options more fully.
9 years ago
Damian Gerow 1c5611100e Add become support for OpenBSD doas 9 years ago
snetting 15669d98ca correct ansible-playbook man1 9 years ago
snetting 4693531851 update ansible man1 9 years ago
Till Maas f36a92f729 Re-Generate man pages 10 years ago
Till Maas 8ad2eac7e1 Mention ANSIBLE_INVENTORY
Support for ANSIBLE_HOSTS is faded out, see commit
c73254543a, therefore do not mention it in
the man pages.
10 years ago
Chris AtLee 1bf8f78b18 Add --list-hosts to man pages.
Fixes #9574
10 years ago
Brian Coca f734306c13 Merge pull request #9859 from autotune/devel
Added description for -S flag and --ask-su-pass #9846
10 years ago
Giovanni Tirloni bcbf819a8b Add how to load extra variables directly from a file (using @). 10 years ago
mixpix3ls 8866378e89 Fixing ticket 9845: man pages contain duplicate AUTHOR section 10 years ago
autotune d052bf8276 Added description for -S flag and --ask-su-pass 10 years ago
Toshio Kuratomi fa51e8f36d Document the --offline parameter to galaxy init
Fixes #9758
10 years ago
Michael Scherer 9c10a11aea Fix the synopsis in ansible-pull man page. 10 years ago
Michael DeHaan e43ae3c0f7 Update test strategies guide. 11 years ago
Cristian Ciupitu 7cb4b7ab89 Fix typos in ansible-playbook man page source
Note: the man page needs to be rebuilt.
11 years ago
James Tanner 33eec0dc55 Fixes #6398 Add missing parameters to ansible-playbook manpage 11 years ago
James Cammarata 12c812f030 Adding a man page for ansible-vault
Fixes #6471
11 years ago
James Cammarata ba4fbd2b66 Adding man page for ansible-galaxy
Partially resolves #6471
11 years ago
James Cammarata 6f405c8970 Updated footer date and adding in misc. file generated by earlier doc update 11 years ago
Maykel Moya 0b1320e48c Update doc, irc and mailing list information in manpages input 11 years ago
Maykel Moya 06beddfe68 Fix documentation url 11 years ago
Maykel Moya 0b44a3e54f Minor grammar fix in manpages 11 years ago
Michael DeHaan 388365b90a Add reference to Guru to sidebar. 11 years ago
Matthew Phipps d78951e767 Add skip_tags to ansible-playbook man page 11 years ago
Michael DeHaan 0882eefdff Merge conflict 11 years ago
Michael DeHaan 2f811c40d7 Basic docsite formatting fixups 11 years ago
Michael DeHaan fdb8505a5e Add ansible-pull's -o to the manpage. 11 years ago
Michael DeHaan 52b2cfedfc Add release history for 1.4.1 into 1.5 branch. 11 years ago
Michael DeHaan f7c3975f21 Add version_added to all modules missing version_added information, the docs formatter will now
raise errors when omitted, updated changelog with new modules.
11 years ago
jctanner 2d9087b806 Merge pull request #4484 from mscherer/add_short_hostname
ansible-pull by default will look for local.yml and $fqdn.yml.
11 years ago
jctanner 127efdf3ef Merge pull request #4576 from mscherer/pull_temporary_dir_2
add a default value for the -d option of ansible-pull
11 years ago
Ray b5266a562d minor correction
Same doc-typo (confirmed) as https://github.com/ansible/ansible/pull/4759

--remote-user  *should be*  --user
11 years ago
Ray a66f0462cd minor correction
--remote-user= does not work:
 ansible: error: no such option: --remote-user

--user= does. Updating docs
11 years ago
Michael DeHaan ad5731b4a8 Add module utils path to setup.py 11 years ago
Michael Scherer f8b23e5721 add a default value for the -d option of ansible-pull
Thi permit to simplify the command line to use by using
a sensible default, and so reduce the number of incorrect
possible choices and setup needed. Among potential
incorrect choices is using a fixed directory in /tmp, which
could be problematic with a setup whose access is not
properly restricted.
11 years ago
Michael Scherer 92147aff0f also fix the doc, forgot in last commit 11 years ago
James Cammarata 97e3e967a7 Merge branch 'devel' of https://github.com/jflorian/ansible into jflorian-devel 11 years ago
James Cammarata 8283183023 Adding sshpass as packaging requirement and fixing VERSION 11 years ago
John Florian c8a5aabf39 Added -f/--force option to ansible-pull 11 years ago
Stephen Fromm 77b8ee1f84 Update ansible-pull man page doc (issue #3372) 11 years ago
Michael DeHaan f0d7324e25 Merge pull request #3094 from sfromm/issue2464-redux
Updates to ansible-pull and ansible-pull docs
12 years ago
Michael DeHaan 4ae3ef8af9 Disable inventory test 12 years ago
Stephen Fromm a611027329 Update ansible-pull documentation 12 years ago
Michael DeHaan b19609b98b Slight docs tweak 12 years ago
Michael DeHaan 0837c9785f Merge pull request #3040 from bfabio/devel
Support JSON in --extra-vars.
12 years ago
Michael DeHaan 267b29cec7 Manpage tweaks, docs rebuild 12 years ago
Fabio Bonelli 6bef150695 Support JSON in --extra-vars.
If --extra-vars starts with either a '{' or a '[', it will be assumed
we are dealing with JSON and parse the data as such.
12 years ago