Commit graph

1434 commits

Author SHA1 Message Date
Michael DeHaan
95f30f0def Complete streamlining of vars handling in playbooks and how those are templated to avoid
repeat template calls at playbook intialization time.
2013-04-06 10:45:09 -04:00
Michael DeHaan
1dfe60a6ea Allow any parameter in a play to be set by --extra-vars through cleaner use of data structure
templating.
2013-04-06 10:09:16 -04:00
Michael DeHaan
4cd69e81b9 Catch recursive templating errors and display what string caused them. 2013-04-06 09:55:31 -04:00
Blair Zajac
36b3fc3acf Fix for inventory scripts with no path prefix that are in CWD.
Without this, using '-i ec2.py' will not work if '.' is not in PATH.
2013-04-05 20:52:59 -07:00
Michael DeHaan
f585c4cde7 Upgraded variable support met with upgraded conditional support, see examples/playbooks/upgraded_vars.yml
for details!
2013-04-05 19:10:32 -04:00
Michael DeHaan
38c2b14339 Undefined Jinja2 statements are returned as they originally are so you can tell there are things to
correct.
2013-04-05 17:36:53 -04:00
Michael DeHaan
49d28b9a44 This SELinux commit is too strict and we should only fail if trying to read/tweak SELinux attributes else
python-selinux can't be installed w/ the yum module when missing.

Revert "Added an extra check for target nodes with selinux but without libselinux-python package installed"

This reverts commit 550986b6a1.
2013-04-05 14:54:11 -04:00
Michael DeHaan
2c881e2b3d Merge pull request #2578 from arrfab/selinux-fix-2
Added an extra check for target nodes with selinux but without libselinux-python package installed
2013-04-05 11:52:14 -07:00
Michael DeHaan
9073aa17ab Chroot also needs args/kwargs. 2013-04-05 14:50:15 -04:00
Michael DeHaan
3d25b4a7c0 Standardize args/kwargs on connection plugins. 2013-04-05 14:50:15 -04:00
Dag Wieers
d5d26bab9b Make private key customizable per host using ansible_ssh_private_key_file configurable as variable
This fixes issue #1026 for @toshywoshy together with ansible_ssh_user and ansible_ssh_port.
2013-04-05 14:50:15 -04:00
Fabian Arrotin
550986b6a1 Added an extra check for target nodes with selinux but without libselinux-python package installed 2013-04-05 20:37:58 +02:00
Michael DeHaan
8c859f6f61 Merge pull request #2570 from skvidal/devel
simple fix for issue 2564
2013-04-05 11:07:22 -07:00
Michael DeHaan
550bf47636 Merge pull request #2565 from willthames/default_exec
Added DEFAULT_EXECUTABLE as a constant
2013-04-05 10:56:56 -07:00
Michael DeHaan
f37da4fdd7 Merge branch 'ssh_config_user_overrides' of git://github.com/bcoca/ansible into devel 2013-04-05 13:09:38 -04:00
Michael DeHaan
b67cd6bbda Merge branch 'any-errors-fatal' of git://github.com/junegunn/ansible into devel 2013-04-05 13:07:23 -04:00
Seth Vidal
2796b5ee2a simple fix for issue 2564
when we encounter a group we've not seen before - we need
to make sure we make it a subgroup of 'all', no matter what
2013-04-04 12:44:39 -04:00
willthames
e55e123c01 Added DEFAULT_EXECUTABLE as a constant
Use DEFAULT_EXECUTABLE when no executable is passed to
_low_level_command_exec

Works as a standard constant - can be overridden in all the normal ways
and defaults to /bin/sh

Motiviation is for a user that only has /bin/bash in /etc/sudoers
2013-04-04 13:32:23 +10:00
Michael DeHaan
cdaa2085ee Preliminary ability to use Jinja2 {{ }} to replace ${foo.bar} in playbooks. Can't use both at the same time per line. 2013-04-03 01:04:16 -04:00
Michael DeHaan
aa4ad80bda Update release version. 2013-04-02 20:48:30 -04:00
Junegunn Choi
b874027b36 compare the number of available hosts before and after running each task 2013-03-29 13:13:22 +09:00
Junegunn Choi
20a48c6bdf terminate immediately on a failure 2013-03-28 15:17:01 +09:00
Brian Coca
82c3b4e685 now ssh connection plugin will only pass user as an option to ssh if it is
differnt from the current user. This should enable overrides for user in
.ssh/config w/o breaking any current functionality.

Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-03-27 16:41:54 -04:00
Michael DeHaan
42b0e51223 Upgrade callbacks further, now '.play', '.task', and so on are also available! 2013-03-25 22:56:32 -04:00
Michael DeHaan
0d11f53eff Let the callbacks see the playbook and (current) runner objects. 2013-03-25 22:47:06 -04:00
Michael DeHaan
783a12cc0e Resolve merge commit. 2013-03-25 22:32:01 -04:00
Michael DeHaan
3c5890f42b Ensure that when transferring a file to a directory the name of the file is the correct basename and not 'source'. 2013-03-25 22:19:35 -04:00
Michael DeHaan
7044e53e07 Allow conditionals on BYPASS_HOST_LOOP plugins like add_host 2013-03-25 21:16:18 -04:00
Michael DeHaan
9be44c201a Merge pull request #2455 from robparrott/debuggin-help
inject a dictionary of avaiable variables and the environment into executor
2013-03-24 14:49:37 -07:00
Michael DeHaan
fe2f506514 Merge pull request #2462 from sfromm/issue2461
Make logging to journal match what goes to syslog on non-systemd hosts
2013-03-24 14:46:10 -07:00
Stoned Elipot
86995d7786 Fix pathnames in comments 2013-03-22 02:11:58 +01:00
Stephen Fromm
cdb7f8ecf0 Make logging to journal match what goes to syslog on non-systemd hosts
This makes the log message the same, whether it is sent to systemd's
journal or to syslog.  It retains the extra fields that are passed to
journal, such as MOUDLE=<name> and additional arguments.  Since journal
will reflect messages to syslog, this keeps what goes to syslog
informative instead of the terse 'Ansible module invoked'.

See issue #2461.
2013-03-19 16:07:15 -07:00
Rob Parrott
149f1f9f3c invalidate group cache so that a group added by the add_host module will be relfected in the groups variable in later plays. 2013-03-19 13:57:45 -04:00
Rob Parrott
81e2d871aa inject a dictionary of avaiable variables and the environment into the executor, so that templates can be used to debug playbooks by dumping more of the available context. 2013-03-19 13:04:57 -04:00
David Hughes
c365974117 Added variable expansion to task sudo_user parameter 2013-03-15 11:31:27 -07:00
Michael DeHaan
6f25885c1a Merge pull request #2397 from dparalen/play_task_type_check
check type of task explicitly
2013-03-14 08:24:41 -07:00
milan
80dbab3cf0 check type of task explicitly 2013-03-14 13:06:55 +01:00
Daniel Hokka Zakrisson
27978ed9c1 Don't override argument specs with FILE_COMMON_ARGUMENTS
Doing so will remove aliases, types, etc, leading to #2388 and other
issues.
2013-03-14 11:22:46 +01:00
Michael DeHaan
d0332a6c6d Merge branch 'playbook-step' of git://github.com/skvidal/ansible into devel 2013-03-13 22:26:59 -04:00
Michael DeHaan
0c80c76833 Fixes #2380 - argument checking in file accepts chained arguments from copy 2013-03-12 21:57:38 -04:00
Michael DeHaan
77198b09e9 Add content to the list of file common arguments. 2013-03-12 01:06:55 -04:00
Stoned Elipot
8edda38c61 exception safe list/tuple replacing for non-str values 2013-03-12 05:01:45 +01:00
Michael DeHaan
e241bb5801 Merge pull request #2367 from bcoca/catch_mismatched_json
now cleanly catches traceback when conflicting versions of simplejson and python are installed
2013-03-11 15:26:01 -07:00
Michael DeHaan
a22009806e Nested iteration would make more sense in this order. 2013-03-11 17:58:27 -04:00
Michael DeHaan
edc04d61f3 Added 'with_nested' lookup plugin that can easily do nested loops. 2013-03-11 17:47:57 -04:00
Michael DeHaan
298d64aa1d Quote remote md5 operations. Fixes #2368 2013-03-11 17:19:43 -04:00
Michael DeHaan
e304cc3d8e Simple fix for spaces in filenames with the template module. 2013-03-11 17:13:59 -04:00
Michael DeHaan
6e2ea327d1 A very simple fix to enable spaces in the files sent via the copy module. 2013-03-11 17:11:53 -04:00
Brian Coca
95a977cfc9 now cleanly catches traceback that occurs when running newer simplejson with
older python interpreter.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-03-11 15:10:49 -04:00
Seth Vidal
a7a083d882 when --step isn't specified make sure to print the banner 2013-03-11 09:48:32 -04:00
Seth Vidal
7687c2caf8 add --step option to ansible-playbooks to let people step through a playbook
one by one - asking for confirmation along the way.

also allows to 'continue' after a certain point
2013-03-11 00:39:05 -04:00
Michael DeHaan
2962073bcf Merge branch 'fix-module-encoding' of git://github.com/andreparames/ansible into devel 2013-03-18 00:17:07 -04:00
Michael DeHaan
f2c8df2a93 Clarify an error message 2013-03-17 23:33:13 -04:00
Patrick Pelletier
c7c7a63ee5 Add support to directly set content in copy module 2013-03-17 23:33:13 -04:00
Michael DeHaan
c53653dc0d Merge pull request #2348 from candeira/password-plugin
password lookup plugin, with working tests and documentation
2013-03-10 16:31:17 -07:00
Michael DeHaan
b2c8ed9cc2 Merge pull request #2279 from dorfsmay/fetch-fail_on_missing
Added a fail_on_missing option to fetch.
2013-03-10 16:18:28 -07:00
Michael DeHaan
aae88baf4a Merge pull request #2260 from skvidal/path_lookup
first_found lookup_plugin - replaces first_available_file
2013-03-10 16:09:49 -07:00
Michael DeHaan
bb696e88b4 Merge pull request #2286 from gavares/url_timeout
Add socket timeout to uri module.
2013-03-10 15:37:32 -07:00
Javier Candeira
ca6c36e1ac password lookup plugin, with working tests and documentation 2013-03-10 13:36:53 +11:00
André Paramés
9bb8435ec9 Fixes #2346 2013-03-09 03:27:45 +00:00
Daniel Hokka Zakrisson
76f3351b02 Move complex_args templating to be with module_args
Keeps every action plugin from having to do the same thing.
2013-03-07 11:09:29 +01:00
Michael DeHaan
ffbd4b5a2c Template options sooner on complex args copy 2013-03-07 00:35:40 -05:00
Michael DeHaan
2bb305f6d5 Fix args templating for complex args with the copy module. 2013-03-07 00:28:06 -05:00
Michael DeHaan
969edabdbb Merge pull request #2322 from bcoca/remote_tmp_override
added check for starting $HOME for remote_tmp so as to non root sudo override
2013-03-06 21:07:49 -08:00
Michael DeHaan
44e44cf295 Merge pull request #2320 from jkleckner/minor-spelling-fixes
Minor spelling fixes
2013-03-06 21:06:33 -08:00
Michael DeHaan
fe8547cac0 Ensure template arguments if complex are still properly templated 2013-03-07 00:04:48 -05:00
Brian Coca
76f709286e added check for starting $HOME for remote_tmp so as to non root sudo override
Signed-off-by: Brian Coca <bcoca@tablethotels.com>
2013-03-06 17:32:12 -05:00
Jim Kleckner
92844d3dcd Minor spelling fixes 2013-03-06 10:41:19 -08:00
Maykel Moya
e898f30f78 Fix copyright 2013-03-06 02:40:34 +01:00
Daniel Hokka Zakrisson
3d49f74df6 Make apt upgrade=dist work and make its argument handling more idiomatic
Fixes #2287.
2013-03-05 23:46:34 +01:00
Daniel Hokka Zakrisson
1784fd80cc When a host list is used, no parser is present 2013-03-04 12:37:15 +01:00
Grant Gavares
cd51c7f234 Add socket timeout to uri module.
The uri module can be configured to abort after a specified timeout if
it cannot connect to the configured uri. This prevents a uri action from
hanging indefinitely when the remote endpoint cannot be reached because
it is unavailable, there is a firewall in place etc. The default behavior
is left unchanged: timeout=None

This change also introduces a new type for module_parameters: int
Code was added to perform conversion from string -> int type in
module_common.py.

The new type was required in order to play nice with httplib2 which
refuses to accept (and convert) anything other than a numeric type for
the timeout value.
2013-03-02 17:34:23 -08:00
Yves Dorfsman
e45a0fd61d Added a fail_on_missing option to fetch. 2013-03-02 11:04:48 -07:00
Michael DeHaan
6ad390a92b Revert "Revert "for #2196 now gruopby module invalidates host cached variables so they can be reevaluated with new groups""
This reverts commit dc0515a88a.

We didn't need to revert this :)
2013-03-02 10:38:51 -05:00
Daniel Hokka Zakrisson
5d82b4b1b7 group_by needs the untemplated module_args 2013-03-02 16:30:30 +01:00
Michael DeHaan
dc0515a88a Revert "for #2196 now gruopby module invalidates host cached variables so they can be reevaluated with new groups"
This reverts commit 2d86671aa5.
2013-03-02 10:21:36 -05:00
Daniel Hokka Zakrisson
43ce2caa4f Fix parse_kv invocation in group_by to use imported name
Fixes #2277.
2013-03-02 15:18:16 +01:00
Daniel Hokka Zakrisson
2ff2f05a0f host.get_variables includes too many variables, use host.vars instead
Not quite as attractive, but allows variable precedence and lazy
resolution to work as intended, rather than resolving them on a
per-inventory basis.
2013-03-02 10:26:26 +01:00
Michael DeHaan
0b4ad2749a Increase error handling in the unlikely case of failing to establish a connection. 2013-03-01 21:39:50 -05:00
Michael DeHaan
5fd807ac64 Merge pull request #2262 from bcoca/json_nice_error
now ansible shows nice message about missing json instead of traceback
2013-03-01 16:39:45 -08:00
Brian Coca
46c913f7a6 now ansible shows nice message about missing json instead of traceback
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-03-01 19:03:59 -05:00
Michael DeHaan
7ac5e462ef Fixed a small buglet, if using with_items with yum and so on, only optimize the package list if the package list is all strings 2013-03-01 18:32:32 -05:00
Seth Vidal
804b130288 check if the term is a dict so we can take a simple list of files (like first_available_file) takes 2013-03-01 18:18:56 -05:00
Michael DeHaan
b6f7a22de5 Merge pull request #2261 from bcoca/groupby_2186
now group by module invalidates host cached variables
2013-03-01 15:16:47 -08:00
Brian Coca
2d86671aa5 for #2196 now gruopby module invalidates host cached variables so they can be reevaluated with new groups
Signed-off-by: Brian Coca <bcoca@tablethotels.com>
2013-03-01 18:00:34 -05:00
Seth Vidal
dfad94078b first_found lookup_plugin - replaces first_available_file
- useful in tasks/playbook inclusion
- task-specific inclusion

allows searching paths and files
2013-03-01 17:25:25 -05:00
Daniel Hokka Zakrisson
f1eb195ff5 vars_loader should get the path to the inventory + vars_plugins 2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
ad08995989 Make inventory basedir for directory based inventory be the directory
This puts host_vars and group_vars inside of the directory, allowing you
to target a single inventory but still have access to the variables.
2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
d9c6b60b24 Allow inventory to be a directory containing other inventories 2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
647cd0141c Move all inventory script code into the script parser 2013-03-01 23:22:52 +01:00
Michael DeHaan
fb26f059c5 Merge pull request #2232 from dhozac/module-args-dict
Allow specifying args directly to actions using module: syntax
2013-03-01 14:03:23 -08:00
Michael DeHaan
e83819599a Merge pull request #2234 from akvadrako/nice-yaml-and-json
add to_nice_yaml|json filters
2013-03-01 13:45:07 -08:00
Michael DeHaan
c92bfb7234 Merge branch 'madcow2' of git://github.com/bcoca/ansible into devel 2013-03-01 16:23:41 -05:00
Jimmy Tang
81a34c2d1d Cowsay on OSX macports 2013-03-01 16:51:13 +00:00
Devin Bayer
fca1167a0e add to_nice_yaml|json filters 2013-02-28 17:07:02 +01:00
Daniel Hokka Zakrisson
ae8d6ac303 Ensure complex_args is considered in all action_plugins 2013-02-28 14:27:42 +01:00
Daniel Hokka Zakrisson
297259725a Allow (local_)action: to be a dict
Use the key module: to set which module to invoke.
2013-02-28 14:12:36 +01:00
Daniel Hokka Zakrisson
c04d5ba739 Allow specifying args directly to actions using module: syntax
Makes things like
- name: do complex things with complex module
  complex:
    setting_a: true
    setting_b:
    - foo
    - bar
possible.

Fixes #2228.
2013-02-28 13:54:04 +01:00
Daniel Hokka Zakrisson
4807fbc8b7 Use regular strings to allow tests to work 2013-02-28 13:52:57 +01:00
Michael DeHaan
323ed27106 Merge pull request #2221 from sfromm/fix-ansible-cli-check-mode
Fix CliRunnerCallbacks.on_file_diff in callbacks.py
2013-02-27 15:34:05 -08:00