Daniel Hokka Zakrisson
047d089cea
Restore git output on --version
...
Broken by the move from utils.py to utils/__init__.py
2012-11-21 23:54:42 +01:00
Daniel Hokka Zakrisson
ef357ed1f2
Use the play's vars for the setup step
...
Allows using -e ansible_ssh_port=foo and have it apply to all actions.
2012-11-21 23:42:24 +01:00
Daniel Hokka Zakrisson
d1c285b70b
Port may be an integer when parsed from the play
2012-11-21 17:20:03 +01:00
Michael DeHaan
82f4aef959
Merge pull request #1648 from dhozac/local-cwd-basedir
...
Use runner's basedir as cwd for -c local
2012-11-21 06:40:01 -08:00
Michael DeHaan
41af2fce64
Merge pull request #1650 from dagwieers/port-not-integer-exception
...
Provide a proper error when the remote_port is not an integer
2012-11-21 06:39:24 -08:00
Daniel Hokka Zakrisson
3ce63d845e
remote_port is None by default
2012-11-21 14:10:10 +01:00
Daniel Hokka Zakrisson
6b69b37eb0
Merge pull request #1649 from dagwieers/template-port
...
Allow the remote port to be templated per play
2012-11-20 13:16:34 -08:00
Dag Wieers
85bba04a1c
Provide a proper error when the provided port is not an integer
...
As reported on the mailinglist, the user received a ValueError when the port number was not templated (fixed in #1649 ) and therefore it was not an integer. This change will catch the exception and provide a proper error so it is more clear.
2012-11-20 19:06:27 +01:00
Dag Wieers
8458f53014
Allow the remote port to be templated
...
This was requested on the mailinglist and seems useful.
2012-11-20 18:53:40 +01:00
Daniel Hokka Zakrisson
48898993b9
Fix removing of temporary files
2012-11-20 16:51:19 +01:00
Daniel Hokka Zakrisson
0ebf4b2d5a
Add destination path to fetch result
2012-11-20 15:39:48 +01:00
Daniel Hokka Zakrisson
bdf05ec9a0
Use runner's basedir as cwd for -c local
2012-11-20 15:36:43 +01:00
Daniel Hokka Zakrisson
f89f07871d
Fix typo in first_available_file error path
2012-11-19 23:02:26 +01:00
Daniel Hokka Zakrisson
f95fefd8c5
Use plugin system to find modules
2012-11-18 19:09:21 +01:00
Daniel Hokka Zakrisson
5dd2ec2cae
Add a way to add directories to just one type of loader
2012-11-18 19:08:59 +01:00
Daniel Hokka Zakrisson
d2abfb9ff8
Ensure runner adds its basedir, so ansible can benefit from plugins
2012-11-18 18:37:20 +01:00
Daniel Hokka Zakrisson
5183417de8
Reinstate ANSIBLE_KEEP_REMOTE_FILES
...
Fixes #1395 .
2012-11-18 18:32:45 +01:00
Daniel Hokka Zakrisson
11175781b8
Use slurp for fetch is sudo is enabled and needed
...
Fixes #1020 .
2012-11-18 17:54:00 +01:00
Daniel Hokka Zakrisson
11afd84d32
Drop dwim prefix from returned items in fileglob
...
Fixes #1618 .
2012-11-18 00:25:38 +01:00
Michael DeHaan
1b78dabcd4
Merge pull request #1632 from dhozac/use-ssh-conn-section-for-scp
...
Use the ssh_connection section for scp_if_ssh
2012-11-17 07:41:35 -08:00
Michael DeHaan
3bc0adacbf
Merge pull request #1634 from dhozac/ssh-password
...
Add password support to -c ssh via sshpass
2012-11-17 07:37:51 -08:00
Daniel Hokka Zakrisson
e6fed9f216
Add password support to -c ssh via sshpass
2012-11-16 23:46:49 +01:00
Daniel Hokka Zakrisson
021172f78d
Use the configured remote_tmp even for root
2012-11-16 23:46:17 +01:00
Daniel Hokka Zakrisson
c906f44d90
Use the ssh_connection section for scp_if_ssh
2012-11-16 23:45:47 +01:00
Michael DeHaan
ab5c0dfe7e
__new__ does not take arguments, remove deprecation warning
2012-11-14 19:58:44 -05:00
Michael DeHaan
096607eea4
Allow fireball to transfer binary files, fixup fireball docs, make fetch work with fireball.
2012-11-14 18:37:17 -05:00
Michael DeHaan
d500398e76
Merge pull request #1616 from dagwieers/skip-register
...
Do not register variable if host has been skipped
2012-11-14 06:33:30 -08:00
Michael DeHaan
52e2654faf
Merge pull request #1621 from dhozac/lookup-with-vars
...
Lookup plugin arguments need to be templated
2012-11-14 06:32:39 -08:00
Daniel Hokka Zakrisson
17e4ce97a4
Create a set of all the hosts in a group to prevent duplicates
...
Fixes #1516 .
2012-11-14 13:35:21 +01:00
Daniel Hokka Zakrisson
e74ffd6764
Lookup plugin arguments need to be templated
2012-11-14 11:17:30 +01:00
Dag Wieers
302eeae65d
Do not register variable if host has been skipped
...
Executive summary: skipping a host corrupts a variable (when it is registered)
We have a play existing out of multiple tasks that check a condition, if one of these tasks fails we want to skip all next tasks in the playbook. I noticed that if we skip a task because a certain condition is met, and this task has a register-attribute, I loose the value in the variable. Which means we cannot use that variable in subsequent tasks to evaluate because it was skipped:
```
- action: command test -d /some/directory
register: task
- action: command test -f /some/directory/file
register: task
only_if: '${task.rc} == 0'
- action: do something else
only_if: '${task.rc} == 0'
```
In the above example, if the second task is skipped (because the first failed), the third action will end with a "SyntaxError: invalid syntax" complaining about the unsubstituted ${task.rc} (even though it was set by the first task and used for skipping the second).
The following play demonstrates the problem:
```
- name: Test register on ignored tasks
hosts: all
gather_facts: no
vars:
skip: true
task: { 'rc': 666 }
tasks:
- action: debug msg='skip = ${skip}, task.rc = ${task.rc}'
- name: Skip this task, just to test if task has changed
action: command ls
register: task
only_if: '${skip} != True'
- action: debug msg='skip = ${skip}, task.rc = ${task.rc}'
- name: Now use task value
action: command echo 'Works !'
only_if: '${task.rc} == 0'
```
And the enclosed fix, fixes the above problem.
2012-11-13 16:57:10 +01:00
Michael DeHaan
44af1408ee
Merge pull request #1611 from dhozac/no-hostvars-templating
...
Keep hostvars from being templated
2012-11-13 05:20:48 -08:00
Michael DeHaan
6793bcbe4d
Merge pull request #1613 from dhozac/use-all-vars-for-hosts-template
...
Use all available vars for hosts:, user: and sudo_user:
2012-11-13 04:47:03 -08:00
Michael DeHaan
2303f65a1a
Merge pull request #1614 from dagwieers/missing-action-error
...
Print the task name (if any) when complaining
2012-11-13 04:46:41 -08:00
Dag Wieers
b96877e5aa
Print the task name (if any) when complaining
...
After spending 10 minutes to find which playbook had an action/local_action missing, I changed the error to include the task name (if set). The error eventually was caused because I added a name to a task, but the dash before the existing action was not removed.
2012-11-13 12:53:42 +01:00
Daniel Hokka Zakrisson
0be1f11ed5
Use all available vars for hosts:, user: and sudo_user:
2012-11-13 12:20:07 +01:00
Daniel Hokka Zakrisson
eebbbd3f0e
Make parameterized playbook includes work with vars as a list
...
Fixes #1610 .
2012-11-13 12:12:18 +01:00
Daniel Hokka Zakrisson
c200c26ced
Keep hostvars from being templated
2012-11-13 11:34:34 +01:00
Michael DeHaan
e3f7f86ac4
Merge pull request #1608 from dhozac/when_set-non-string
...
Try to ensure the entire value is quoted
2012-11-12 17:45:47 -08:00
Michael DeHaan
d5be13c3f0
Merge pull request #1605 from romeotheriault/add-md5-support-to-fetch-module
...
add bsd md5 support to fetch module
2012-11-12 17:45:07 -08:00
Daniel Hokka Zakrisson
0ca1775bda
Try to ensure the entire value is quoted
2012-11-13 02:40:29 +01:00
Daniel Hokka Zakrisson
25a8787e95
Template all variables before returning them to Jinja2
2012-11-13 02:39:33 +01:00
Daniel Hokka Zakrisson
d2dce1d63f
Make lookup plugin replacements part of the main variable logic
2012-11-13 02:18:05 +01:00
Daniel Hokka Zakrisson
a2bb3a09d2
Completely ignore stray $ in input
...
Previously, "a $ string $var" would not have gotten replaced at all.
2012-11-13 02:13:10 +01:00
Daniel Hokka Zakrisson
24b536d7ed
Add some comments to templating system
2012-11-13 02:13:04 +01:00
Romeo Theriault
4cd133ed8f
add bsd md5 support to fetch module
2012-11-12 10:37:00 -10:00
Daniel Hokka Zakrisson
233a36b9e8
Template using module_vars early
...
Since no basedir is available at that time, avoid invoking
lookup plugins since they assume it is present.
2012-11-12 16:53:24 +01:00
Michael DeHaan
c890ae18e7
Merge pull request #1575 from dhozac/parameterized-playbook-include
...
Add parameterized playbook includes
2012-11-12 05:17:38 -08:00
Michael DeHaan
3e855a5fcd
Merge pull request #1593 from dhozac/lookup_generic
...
Add support for generic $XXX() to call $LOOKUP()
2012-11-12 05:07:52 -08:00
Michael DeHaan
451f05fa3d
Merge pull request #1594 from sfromm/issue1342
...
Add ability to specify syslog facility for modules
2012-11-12 05:06:47 -08:00
Romeo Theriault
54b7f59416
remove verbose option on digest call
2012-11-11 19:43:40 -10:00
Stephen Fromm
06e54c0b97
Add ability to specify syslog facility for modules
...
Update constants.py so that one can specify environmental variable
ANSIBLE_SYSLOG_FACILITY or syslog_facility in ansible.cfg to define
the syslog facility to use. Alternatively, you can specify
ansible_syslog_facility in inventory. Runner now replaces
the syslog facility in the openlog() call with the default or
the injected variables ansible_syslog_facility.
This also updates hacking/test-module to behave similarly.
2012-11-11 00:14:08 -08:00
Daniel Hokka Zakrisson
9924555623
Add support for generic $XXX() to call $LOOKUP()
2012-11-10 23:46:37 +01:00
Michael DeHaan
40e49b6a5a
Merge pull request #1592 from jpmens/lookup_dnstxt3
...
$LOOKUP(dnstxt): handle exceptions
2012-11-10 08:52:30 -08:00
Jan-Piet Mens
bd55899a60
$LOOKUP(dnstxt): handle exceptions
...
de-spaced
2012-11-10 17:50:21 +01:00
Michael DeHaan
db3e8c0803
Merge pull request #1579 from jpmens/lookup_env
...
Add environment $LOOKUP plugin
2012-11-10 06:30:37 -08:00
Michael DeHaan
35679e0093
Merge pull request #1578 from jpmens/lookup_redis
...
Add Redis GET $LOOKUP plugin
2012-11-10 06:30:10 -08:00
Jan-Piet Mens
6efc98e8a3
Add environment $LOOKUP plugin
...
remove support for multiple vars
2012-11-10 08:26:09 +01:00
Jan-Piet Mens
e3e545418d
Add Redis GET $LOOKUP plugin
...
renamed
2012-11-10 08:21:48 +01:00
Jan-Piet Mens
e32f4a0564
Move get_docstring from module_formatter into ansible/utils
2012-11-09 17:15:41 +01:00
Daniel Hokka Zakrisson
9c095b72b9
Add parameterized playbook includes
...
Also makes with_* work with them.
Fixes #1162 .
2012-11-09 15:43:49 +01:00
Daniel Hokka Zakrisson
383dc30560
Rename varReplaceWithItems to template_ds
2012-11-09 15:43:29 +01:00
Michael DeHaan
325025a5b6
Merge pull request #1574 from dhozac/ssh-moar-data
...
Make sure we get all data
2012-11-09 05:08:27 -08:00
Michael DeHaan
fa17540a06
Merge pull request #1570 from skvidal/addhost
...
Addhost module
2012-11-09 04:51:15 -08:00
Daniel Hokka Zakrisson
e97a22603f
Make sure we get all data
2012-11-09 11:24:57 +01:00
Jan-Piet Mens
38d9dc8bff
Add DNS TXT record LOOKUP plugin
2012-11-09 11:06:49 +01:00
Seth Vidal
70d61fe7e8
need to use the variabled results
2012-11-09 00:16:17 -05:00
Seth Vidal
e147ad4213
add add_host action plugin - add hosts to inventory during a playbook
...
run - lets act on those hosts in the next play
2012-11-09 00:16:17 -05:00
Michael DeHaan
03591e0fc8
Merge pull request #1551 from dagwieers/local_action-fail
...
Turn 'fail' and 'debug' modules into action_plugins
2012-11-08 16:47:24 -08:00
Michael DeHaan
a31ca213a5
Merge pull request #1562 from dagwieers/oneline-fix
...
Make --oneline return one line (except with multiline output)
2012-11-08 16:45:33 -08:00
Michael DeHaan
03f4b0f923
Merge pull request #1560 from dagwieers/module-output-consistency
...
Make module output more consistent wrt. changed/failed
2012-11-08 16:45:05 -08:00
Michael DeHaan
3dc31a049f
Merge pull request #1527 from fdavis/devel
...
Support scp in an ssh connection
2012-11-08 16:42:37 -08:00
Dag Wieers
d42eb2563b
Make --oneline return one line (except with multiline output)
...
Currently the message prepared for --oneline mode adds a newline to the msg-string, which is then printed (adding another newline). This change removes the added newline so that successes and failures do not differ in output (except if the output is multiline).
2012-11-08 14:49:40 +01:00
Dag Wieers
fe0c70fe9d
Make module output more consistent wrt. changed/failed
...
- Make sure exit_json() always returns a changed= value
- Modify the yum module to not return failed=False
- Modify install() and latest() similar to remove() in yum module
- Changed exit_json(failed=True, **res) into a fail_json(**res)
- Make sure yum rc= value reflects loop (similar to how we fixed remove())
2012-11-08 12:28:18 +01:00
Dag Wieers
dd07011a65
Only print 'Invoked with' if there are arguments to the module
...
This closes #1519
2012-11-07 23:51:44 +01:00
Dag Wieers
d8459425a0
Turn 'fail' and 'debug' modules into action_plugins
...
This makes more sense as there is no purpose in running these remotely.
2012-11-07 23:34:53 +01:00
Daniel Hokka Zakrisson
47082a9171
Add $LOOKUP(<lookup plugin>,<data>) as a templating option
...
Also moves file and pipe to lookup_plugins.
2012-11-07 23:17:29 +01:00
Michael DeHaan
a1f7334634
Merge pull request #1525 from jhoekx/custom-filter-plugins
...
Support custom jinja2 filters.
2012-11-07 13:55:21 -08:00
Michael DeHaan
c9ae19c44c
Merge pull request #1547 from dagwieers/action-boolean
...
Bail out if an action is not a string
2012-11-07 13:52:07 -08:00
Dag Wieers
c9e62d7061
Fix for an exception when for whatever reason the inventory script fails
...
This avoids a traceback that gave no clue as to what was happening.
This is in line with the change from #1535
2012-11-07 15:16:00 +01:00
Dag Wieers
dfa1e8b0dc
Bail out if an action is not a string
...
Since YAML allows anything, we should enforce that actions are strings.
This closes #1419 .
2012-11-07 15:04:04 +01:00
Michael DeHaan
75d3b77454
Merge pull request #1535 from dagwieers/inventory-exception
...
Fix for an exception when for whatever reason the inventory script fails
2012-11-07 04:06:33 -08:00
Daniel Hokka Zakrisson
00aa584c57
Don't double dwim first_available_file in template
2012-11-06 20:34:05 +01:00
Dag Wieers
89206a6b68
Fix for an exception when for whatever reason the inventory script fails
...
This avoids a traceback that gave no clue as to what was happening.
2012-11-06 16:39:10 +01:00
fdavis
b1dbeec66c
Allows use of scp instead of sftp in
...
Added a boolean constant scp_if_ssh to the config
Added scp support for the ssh connection plugin
Refers to #1279
2012-11-05 14:25:40 -08:00
Jeroen Hoekx
8ffed6df75
Support custom jinja2 filters.
...
This uses the plugin framework to add filter plugins.
The previously hardcoded core filters are defined using the plugin
framework now.
2012-11-05 15:11:34 +01:00
Michael DeHaan
6f938c9f4c
Merge branch 'playbook_ssh_ask_pass' of git://github.com/clatour/ansible into devel
...
Conflicts:
examples/ansible.cfg
+ doc tweak
2012-11-03 19:23:38 -04:00
Michael DeHaan
908c43ad7f
Merge branch 'devel' of git://github.com/skorokithakis/ansible into devel
2012-11-03 19:19:59 -04:00
Michael DeHaan
05de2152a0
Merge branch 'sudo_ask_pass_config' of git://github.com/bcoca/ansible into devel
2012-11-03 19:09:40 -04:00
Michael DeHaan
154a00e612
Merge branch 'plugin-sanity' of git://github.com/dhozac/ansible into try_new_plugins
2012-11-03 19:04:23 -04:00
Michael DeHaan
c96f2c968e
Merge branch 'nigelm_freebsd' of git://github.com/nigelm/ansible into merge-service
...
Make things more reusable, correct some errors along the SSH key path
Conflicts:
library/user
2012-11-03 18:38:05 -04:00
Seth Vidal
e19c81977d
if a module returns failed in the results, don't fail unless failed is not false.
2012-11-02 15:24:17 -04:00
Chandler Latour
f436a8c88b
Added config option for default ask for ssh_pass
2012-11-02 10:53:26 -05:00
Daniel Hokka Zakrisson
e05e514861
Create a plugin loader system
2012-11-02 01:24:14 +01:00
Daniel Hokka Zakrisson
000d3832cc
Make ansible.utils a package
2012-11-02 00:42:37 +01:00
Stavros Korokithakis
3616dffb68
Detect whether we're running in a virtualenv.
2012-11-02 01:42:04 +02:00
Michael DeHaan
4c156e4df8
Merge pull request #1502 from dhozac/improved-lookup-plugins
...
Improved lookup plugins
2012-11-01 16:36:03 -07:00
Michael DeHaan
025402c0bf
Merge pull request #1507 from lorin/pretty-print-msg
...
Pretty-print "msg" when task fails
2012-11-01 16:33:41 -07:00
Stavros Korokithakis
d9a377cbb1
Fix installing to virtualenvs.
2012-11-01 20:40:28 +02:00
Daniel Hokka Zakrisson
07ba7e2013
Return original string for non-matched vars
2012-11-01 18:53:23 +01:00
Lorin Hochstein
1c5ac5cac8
Pretty-print "msg" when task fails
...
Several modules (e.g., pip) return stdout and stderr together in a "msg" variable (and the module development docs seem to suggest that the standard practice is to return status in this variable).
This change ensures that it is printed out with correct formatting (most importantly, with newlines appearing as newlines instead of \n).
2012-11-01 13:23:18 -04:00
Daniel Hokka Zakrisson
fbda2d4628
Use default port if ansible_ssh_port is not set for the delegated node
...
Also add testcase for it.
2012-11-01 12:00:49 +01:00
Daniel Hokka Zakrisson
c519d5dac0
Add a template lookup plugin
...
Requires that inject be passed to run
2012-10-31 16:57:10 +01:00
Daniel Hokka Zakrisson
37d9acc097
Make lookup API extensible and allow basedir to be passed
...
This allows using with_fileglob in play context, e.g.
- include: $item
with_fileglob: tasks/*.yml
as well as prepares for other data to be passed.
2012-10-31 16:55:38 +01:00
Daniel Hokka Zakrisson
2c77cf1a49
Skip tasks with a with_* that is empty
2012-10-31 16:37:26 +01:00
Brian Coca
604bf9f58a
Added config option to control default of asking or not for sudo password
...
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2012-10-30 23:36:07 -04:00
Michael DeHaan
be300b562a
pyflakes fixes (mostly unused imports, unused vars)
2012-10-30 20:47:05 -04:00
Michael DeHaan
c0747b7baa
pep8 fixes
2012-10-30 20:42:07 -04:00
Michael DeHaan
0853ece810
Merge pull request #1474 from jhoekx/group-by-plugin-template
...
Add a group_by action plugin.
2012-10-30 16:54:07 -07:00
Michael DeHaan
f9a6265fb2
Merge branch 'vars_files-list-no-default' of git://github.com/dhozac/ansible into devel
2012-10-30 19:50:31 -04:00
Michael DeHaan
6dceef3a5f
Merge branch 'fix-var-in-var' of git://github.com/dhozac/ansible into devel
2012-10-30 19:48:32 -04:00
Daniel Hokka Zakrisson
efe83daf19
Fix ${var.$other_var} and add test cases for it
2012-10-30 13:05:45 +01:00
Michael DeHaan
9a12873166
Merge pull request #1477 from skvidal/devel
...
add check that vars plugins are not handing back None
2012-10-29 16:02:26 -07:00
Seth Vidal
3fcc591f18
add check that vars plugins are not handing back None
2012-10-29 12:11:57 -04:00
Dag Wieers
3728b2f459
Missing errors-import causes traceback
2012-10-29 15:16:26 +01:00
Jeroen Hoekx
b336d40101
Add a group_by action plugin.
2012-10-29 13:10:23 +01:00
Jeroen Hoekx
f963db6c2a
Fix output of pause plugin.
2012-10-29 10:57:13 +01:00
Jeroen Hoekx
77162e95e4
Send a host to runner executor instead of a letter.
...
Discovered in #1463 .
2012-10-29 09:45:44 +01:00
Daniel Hokka Zakrisson
e72fdccd87
Allow vars_files sequences without a default
2012-10-28 16:35:22 +01:00
Daniel Hokka Zakrisson
55a1473d50
Don't add file module arguments by default
...
This allows the postgresql_db module to work properly, as it uses
an argument named owner that conflicts with the file module.
2012-10-28 11:14:29 +01:00
Michael DeHaan
21258dcc66
Added 'when' as a shortcut around only_if.
2012-10-27 17:55:35 -04:00
Michael DeHaan
a768e9a9ff
Fix for sudo defaults if sudo is passed in via --extra-vars
2012-10-27 16:46:33 -04:00
Michael DeHaan
6ba30170dd
Make group_vars and host_vars available to usr/bin/ansible, and make vars_plugins exist
2012-10-26 19:55:59 -04:00
Michael DeHaan
e04dab904a
Use previous proven multiprocessing logic as the simplification didn't have the same Ctrl-C handling and may
...
be subject to race issues, though still don't pass Runner to each. Still seems performant.
2012-10-26 18:11:38 -04:00
Daniel Hokka Zakrisson
1052dd9c8f
Initialize sftp variable to fix error on transferless session
2012-10-26 23:54:21 +02:00
Michael DeHaan
5e2c2564bc
Explicitly execute /bin/sh versus $SHELL because some folks have very incompatible/weird shells. We do not
...
execute modules through the shell, this is only for basic ops, so should be sufficient.
2012-10-25 23:00:07 -04:00
Michael DeHaan
ff787146d1
stray debug
2012-10-25 22:24:15 -04:00
Michael DeHaan
24416b9e49
Remove stray debug message
2012-10-25 22:19:50 -04:00
Michael DeHaan
3257c5b61f
Some caching improvements to paramiko which are still not yet fully leveraged
...
in playbook mode, since the Runner still closes abstract host connections completely
and does not have a LRU.
2012-10-25 22:09:54 -04:00
Michael DeHaan
4c83c274e0
Don't close paramiko SFTP multiple times in the same runner pass. Noticeable performance increase.
2012-10-25 21:49:28 -04:00
Michael DeHaan
8b50ad7e85
Fix for atomic_replace patch if file does not yet exist
2012-10-25 21:40:05 -04:00
Daniel Hokka Zakrisson
7a8009f979
When atomically replacing files, copy attributes
2012-10-25 21:40:05 -04:00
Michael DeHaan
19a5f86c2e
Merge pull request #1452 from dhozac/with_items-as-plugin
...
Make with_items a lookup plugin
2012-10-25 18:24:34 -07:00
Michael DeHaan
9a141160a4
Merge pull request #1449 from dhozac/localhost-interpreters
...
Use the delegated host's interpreters
2012-10-25 18:19:26 -07:00
Michael DeHaan
347b0260c3
Merge varReplace cleanup and move code into new file 'template.py' so it's easier to keep template
...
code all together.
2012-10-25 21:18:08 -04:00
Michael DeHaan
f8e946b71d
Merge branch 'varfind-cleanups' of git://github.com/dhozac/ansible into devel
2012-10-25 20:14:20 -04:00
Daniel Hokka Zakrisson
2f05e95d8a
Use lookup plugins for task include with_*
2012-10-25 15:13:34 +02:00
Daniel Hokka Zakrisson
026e251b94
Make with_items a lookup plugin
2012-10-25 15:10:33 +02:00
Michael DeHaan
ffca0283b0
Closing pool explicitly may cause some exceptions on certain Pythons, disable for now.
2012-10-25 09:07:33 -04:00
Daniel Hokka Zakrisson
13a422261b
Use the delegated host's interpreters
2012-10-25 14:10:04 +02:00
Michael DeHaan
bbe66e7610
Merge pull request #1437 from lorin/sudo-nonroot-bugfix
...
Fix chmod occurring as wrong user when sudo as non-root
2012-10-24 17:01:32 -07:00
Michael DeHaan
9fca4eb241
Merge pull request #1441 from dhozac/better-error-missing-template
...
Improve the error message for missing files
2012-10-24 16:58:28 -07:00
Daniel Hokka Zakrisson
b1200c16df
path_dwim the path given to with_fileglob
2012-10-25 00:52:42 +02:00
Daniel Hokka Zakrisson
e216116807
Improve the error message for missing files
2012-10-25 00:30:05 +02:00
Lorin Hochstein
38fdc24966
Fix chmod occurring as wrong user when sudo as non-root
...
If you sudo to a non-root user, you get a permission denied error.
Here's an example:
$ ansible myserver.example.com -m postgresql_db -a "db=mydatabase" -u ubuntu -s -U postgres
myserver.example.com | FAILED >> {
"failed": true,
"msg": "chmod: changing permissions of `/tmp/ansible-
1351092257.96-157699143369671/postgresql_db': Operation not
permitted\n/usr/bin/python: can't open file '/tmp/ansible-
1351092257.96-157699143369671/postgresql_db': [Errno 13]
Permission denied\n",
"parsed": false
}
The problem is that ansible is doing the chmod as the sudo user
when it should be doing it as the remote user.
2012-10-24 11:30:56 -04:00
Michael DeHaan
f1f44843c3
close the pool.
2012-10-24 07:56:23 -04:00
Michael DeHaan
92ce8a0517
Refine new keyboard interrupt handling. Output still a bit gross.
2012-10-24 07:46:24 -04:00
Michael DeHaan
47b1315ac7
Reinstate Ctrl+C handling
2012-10-24 07:40:48 -04:00
Michael DeHaan
a4af4a7049
Since we are not needing to pass runner through the multiprocessing queue, just use
...
multiprocessing.pool. Pushing so it can get wider testing.
2012-10-23 08:19:15 -04:00
Michael DeHaan
856dd5a9aa
Don't pass runner instance through the mulitprocessing queue, fix temp dir removal
2012-10-23 08:04:32 -04:00
Seth Vidal
d63fa6f026
make --limit take a , as a separator as well as ; or :
2012-10-22 21:24:25 -04:00
Michael DeHaan
109632e3bc
Revert "Vars specified via CLI have the highest priority."
...
Reverting as this as reported allows some variables to clobber each other.
We'll work on a different fix.
This reverts commit c5469f6367
.
2012-10-21 16:42:15 -04:00
Daniel Hokka Zakrisson
1449c8ac67
Fix ansible_ssh_host again
...
This time with unit tests to ensure it keeps working.
2012-10-21 21:22:56 +02:00
Daniel Hokka Zakrisson
c9c5fc1456
Merge varFind and varLookup
2012-10-21 20:32:02 +02:00
Michael DeHaan
3c6d9972fe
clarify message about name of configuration parameter
2012-10-21 07:12:06 -04:00
Michael DeHaan
cbc12f0dba
Various performance streamlining and making the file features usable in all modules without daisy chaining.
2012-10-20 22:55:09 -04:00
Michael DeHaan
4104478abd
Added 'script', a module that can push and insantly run a remote script. Replaces the need to copy+command.
...
This is a bit of a rough draft, some error handling still needs to be added.
2012-10-20 12:12:07 -04:00
Michael DeHaan
019f775a93
DWIM the paths for first_available_file
2012-10-20 11:11:31 -04:00
Michael DeHaan
6fa1a49037
Fix the basic templating system such that when the template ends in '$', life continues as normal.
2012-10-20 10:57:52 -04:00
Michael DeHaan
ed9f5eed09
Merge pull request #1338 from alopropoz/extra_vars_override
...
Vars specified via CLI have the highest priority.
2012-10-20 07:29:12 -07:00
Michael DeHaan
5bdc16338e
Release version bump for 0.9 (development branch)
2012-10-19 21:01:57 -04:00
Michael DeHaan
cde377bddb
Merge pull request #1385 from dhozac/raise-error-for-scripts-too
...
Raise error for missing hosts in inventory scripts as well
2012-10-19 07:30:01 -07:00
Daniel Hokka Zakrisson
b8021f12e0
Raise error for missing hosts in inventory scripts as well
2012-10-19 16:26:12 +02:00
Daniel Hokka Zakrisson
e3d18048d4
None is unfortunately not an integer
2012-10-19 16:18:38 +02:00
Michael DeHaan
d509dfc969
delete extra else clause
2012-10-18 20:27:39 -04:00
Michael DeHaan
452668ce83
Merge branch 'devel' of git://github.com/willthames/ansible into devel
2012-10-18 20:23:10 -04:00
Michael DeHaan
31b45479e8
When using delegation, local_action should always use the local connection type.
2012-10-18 20:18:33 -04:00
Daniel Hokka Zakrisson
979999b886
Port should be an integer
2012-10-18 21:48:57 +02:00
Daniel Hokka Zakrisson
19797e1a29
Accessing a node that doesn't exist throws an exception
2012-10-18 21:48:10 +02:00
willthames
5a769a5a4d
Fixed tests to reflect desired configuration behaviour
...
Test for when environment variable and configuration file
variable both set now tests that the environment variable takes
precedence
Removed logic that would never be triggered from
lib/ansible/constants.py
2012-10-18 12:53:30 +10:00
Michael DeHaan
556799a7c4
add error message if keyczar is not installed and the user tries to use fireball mode
2012-10-17 22:53:22 -04:00
Michael DeHaan
d5db8e937e
Fix port overrides such that with fireball mode you don't have to specify an explicit port.
2012-10-17 22:50:17 -04:00
Michael DeHaan
fd6a26239c
Env var vs config priority fixing
2012-10-17 22:34:59 -04:00
Michael DeHaan
0837a29e51
Only expand lists in templating inside of module action lines, to avoid breaking usage with with_items and "in" statements, etc
2012-10-17 19:35:12 -04:00
Michael DeHaan
acf2c23808
Various tweaking of the delegate_to loop code.
2012-10-17 19:17:41 -04:00
Daniel Hokka Zakrisson
37b91c7b81
Fix ansible_ssh_host after 339c05bb
2012-10-17 19:17:41 -04:00
Daniel Hokka Zakrisson
519a1f3f23
Remove debug print statements
2012-10-17 22:45:17 +02:00
Michael DeHaan
22e3e7f323
Allow use of variables in delegate_to
2012-10-16 21:05:09 -04:00
Michael DeHaan
a69e59ab2b
Allows delegate_to to use inventory host/port info.
2012-10-16 20:57:37 -04:00
Michael DeHaan
8c3abe7e52
Fix cowsay! Moo.
2012-10-16 20:01:12 -04:00
Michael DeHaan
63100c9bc0
Docs + fix variable precedence of environment variables (ok, ok, I give in!)
2012-10-16 18:40:01 -04:00
Michael DeHaan
f3407dec0e
Merge branch 'basedir-plugins' of git://github.com/dhozac/ansible into devel
2012-10-16 18:00:55 -04:00
Aleksej Romanov
c5469f6367
Vars specified via CLI have the highest priority.
2012-10-16 04:34:54 +07:00
Brian Coca
e98153d26d
cowsay for BSD!
...
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2012-10-15 10:17:21 -04:00
Daniel Hokka Zakrisson
ab44a4abba
Load additional plugins from path specified in configuration
2012-10-14 21:09:24 +02:00
Daniel Hokka Zakrisson
1aaf86069a
Look for plugins in the playbook's basedir
2012-10-14 21:09:23 +02:00
Michael DeHaan
c5d2f6b0d3
implement lookup plugins for arbitrary enumeration over arbitrary things. See the mailing list for some cool examples.
2012-10-12 20:07:05 -04:00
Michael DeHaan
271db7bddb
Merge pull request #1308 from abondis/named_action
...
named actions + modules list in utils.py
2012-10-12 14:33:43 -07:00
Aurélien Bondis
6d183959ba
#1303 : add sudo option to tasks
2012-10-12 12:39:45 -04:00
Aurélien Bondis
2063e10c00
named actions + modules list in utils.py
2012-10-12 11:28:10 -04:00
Michael DeHaan
5849ab3162
Merge pull request #1300 from tbielawa/fix_module_path
...
Add DIST_MODULE_PATH so setup.py and ansible.spec can live in harmony
2012-10-11 17:30:23 -07:00
Daniel Hokka Zakrisson
b8b34b5110
Keep processing the rest of the vars_files even if one has vars
2012-10-11 23:52:01 +02:00
Tim Bielawa
baa91ebc95
Add DIST_MODULE_PATH so setup.py and ansible.spec can live in harmony. Closes #1277
2012-10-11 13:22:30 -04:00
Michael DeHaan
f3d7294690
Test for directory existance, fix exception catching granularity
2012-10-11 07:56:01 -04:00
Michael DeHaan
448c89a06d
It has been reported that occasionally the md5sum command on certain platforms (?) can fail, where I suspect there is noise in the output stream.
...
In those events, capture the output so we can report the error more properly.
2012-10-11 07:44:41 -04:00
Michael DeHaan
7e542d78a7
Merge remote branch 'stijnopheide/jinja-relative' into devel
...
Conflicts:
.gitignore
2012-10-10 20:24:12 -04:00
Michael DeHaan
e2497f0cff
Merge remote branch 'abondis/named_actions_2' into devel
2012-10-10 19:53:19 -04:00
Jeroen Hoekx
23a62f5a78
Return multiple groups from inventory API.
2012-10-10 18:35:45 +02:00
Aurélien Bondis
e07bfd9ef8
playbook/tasks: allow to use a module's name instead of action:
2012-10-09 00:21:13 -04:00
Michael DeHaan
04954dbc1e
Makes ports configurable for fireball. Note port defaults really belong in the connection plugins, not runner, which can be refactored later.
2012-10-08 19:03:37 -04:00
Jeroen Hoekx
46a4ae74a7
Add inventory variables to hostvars.
...
Look up only when requested and cache the result.
2012-10-08 20:26:58 +02:00
Stijn Opheide
4a6b5c5de2
relative paths for (include/extends) in jinja2 templates
2012-10-08 08:56:57 +02:00
Michael DeHaan
26bbac3062
Merge pull request #1246 from jpmens/nocows
...
Not for cow lovers: optionally disable cowsay
2012-10-07 06:11:29 -07:00
Jan-Piet Mens
051f66cf16
Not for cow lovers: optionally disable cowsay
...
spaces now cow-compatible
2012-10-07 11:23:42 +02:00
Marko Mikulicic
cc82e7dd06
Added a ANSIBLE_FORCE_COLOR env var, which forces the color output no matter what ncurses says.
2012-10-06 20:36:07 +02:00
Michael DeHaan
ebc2fe08c3
Merge pull request #1218 from jpmens/jtempl3
...
Allow user-specified $ansible_managed string
2012-10-04 16:18:57 -07:00
Jan-Piet Mens
9ed59da294
Allow user-specified $ansible_managed string with named parameters
2012-10-04 08:50:51 +02:00
Tim Bielawa
9f6da7b885
Fix variable injection in pause module args. Closes #1209
2012-10-03 23:52:26 -04:00
Michael DeHaan
d14741799a
Merge pull request #1204 from dagwieers/fatal-red
...
Make fatal errors red
2012-10-02 19:06:36 -07:00
Michael DeHaan
459d9ea30d
Merge pull request #1205 from dagwieers/ignore-cyan
...
Make ignored/skipped different from changed
2012-10-02 19:06:14 -07:00
Michael DeHaan
212296e59c
Merge pull request #1207 from dagwieers/gather_facts-fix
...
Fix gather_facts assumption that SETUP_CACHE for a host is empty
2012-10-02 19:05:54 -07:00
Michael DeHaan
cef73d1545
Merge pull request #1202 from dagwieers/abort-play-abort-playbook
...
Abort a play at the start when no hosts matches, or no hosts are remaining
2012-10-02 19:02:27 -07:00
Dag Wieers
fedfd18774
Fix gather_facts assumption that SETUP_CACHE for a host is empty
...
We now check explicitely for 'module_setup' in the SETUP_CACHE in order to avoid skipping setup because SETUP_CACHE was populated some other way. Other modules can implement the same mechanism to test if they've already run.
This closes #1206 .
2012-10-02 23:17:45 +02:00
Dag Wieers
f11ab4383a
Make ignored/skipped different from changed
...
Since a skipped/ignored action is _very_ different from actual changes to a system, it always bothered me that it was not easily distinguishable when skimming the output. This change makes ignore/skip a different color, and I chose cyan. Contemplated using dark-gray/blue, but prefered something that is readable with most terminal colors.
2012-10-02 21:49:04 +02:00
Dag Wieers
7acc0a632b
Make fatal errors red
2012-10-02 21:45:42 +02:00
Dag Wieers
20c1a67711
Abort a play at the start when no hosts matches, or no hosts are remaining
...
This change makes a distinction between no_hosts_matched and no_hosts_remaining.
In both cases we do not start facts-gathering, or run any tasks.
In the case that there are no more hosts remaining, we abort running tasks and abort the playbook.
I also cleaned up the leftovers from the previous patchsets, as these are no longer required.
This closes #1187 .
Example playbook:
```yaml
---
- hosts: emptygroup
tasks:
- action: command date
- action: command false
- hosts: all
gather_facts: False
tasks:
- action: command ls
- action: command false
- action: command true
- hosts: all
tasks:
- action: command true
- action: command false
- hosts: all
tasks:
- action: command pwd
```
2012-10-02 15:54:24 +02:00
Daniel Hokka Zakrisson
564a212b3c
Only gather facts once per node per playbook run
...
Unless gather_facts: True is on the play
2012-10-02 15:30:19 +02:00
Jan-Piet Mens
5f04ef8b4c
Feature: file info on templates accessible to Jinja2 templates
...
add ansible_managed
2012-10-02 14:15:27 +02:00
Michael DeHaan
14f7c85ce7
Include a space and a colon after prompts, so you don't have to put them in yourself. Consistent with documented behavior in examples/playbooks/prompts.yml
2012-10-01 22:15:34 -04:00
Michael DeHaan
b90eccc4f8
Merge pull request #1186 from dhozac/varreplacewi-nonstr
...
Allow non-string types in with_items variables
2012-10-01 19:10:05 -07:00
Michael DeHaan
5683277e4a
Be smarter about when to abort a playbook -- if it's early, we just didn't match any hosts, so keep on, hosts might be dynamic.
2012-10-01 22:07:08 -04:00
Daniel Hokka Zakrisson
48c5d696d2
Remove debug print statement
2012-10-01 17:23:21 +02:00
Daniel Hokka Zakrisson
a83aa1071b
Give each task its own module_vars
...
Otherwise each task will overwrite the previous' items, among
other things.
2012-10-01 17:17:39 +02:00
Daniel Hokka Zakrisson
695b4bcb46
Allow non-string types in with_items variables
2012-10-01 17:07:51 +02:00
Michael DeHaan
a2f76c1c69
If all hosts in a play fail, fail the whole playbook and don't bother printing out every remaining task.
2012-09-30 21:06:00 -04:00
Michael DeHaan
19b78cedc8
Abort a play when there are no more hosts in it.
2012-09-30 20:48:35 -04:00
Michael DeHaan
5846c1b8c4
Merge pull request #1125 from dagwieers/setup-retain
...
Make sure we retain facts between playbooks
2012-09-30 17:18:40 -07:00
Michael DeHaan
d0eba79760
Template out sudo_user so you can pass in variables using --extra-vars
2012-09-30 20:11:51 -04:00
Michael DeHaan
8e9344eef7
add an error when user tries to async something that can't be asynced
2012-09-30 20:06:55 -04:00
Stephen Fromm
cf3e368d15
Add message reporting skipped action in cli callback
2012-09-30 08:54:20 -07:00
Michael DeHaan
e756ee3741
Merge pull request #1159 from dhozac/include-with_items
...
Allow task includes to work with with_items
2012-09-30 05:13:32 -07:00
Daniel Hokka Zakrisson
8a8ffa2342
Allow task includes to work with with_items
2012-09-30 13:40:52 +02:00
Daniel Hokka Zakrisson
dfee6e19ca
Replace lists with a comma-separated join
2012-09-30 11:41:44 +02:00
Daniel Hokka Zakrisson
62db667760
Fix typo in $FILE()
2012-09-30 01:19:22 +02:00
Michael DeHaan
2d7691500e
Merge pull request #1139 from lorin/config-precedence
...
ANSIBLE_CONFIG take precedence over ./ansible.cfg
2012-09-29 13:27:07 -07:00
Michael DeHaan
1fd5de21d2
Merge pull request #1149 from dhozac/non-greedy-filepipe
...
Complete the change from $FILE{} to $FILE()
2012-09-29 13:25:32 -07:00
Michael DeHaan
8b55217df0
Merge pull request #1148 from dhozac/multiline-only_if
...
Allow multiline strings to work okay in only_if
2012-09-29 13:25:07 -07:00
Daniel Hokka Zakrisson
2d81a1fa77
Complete the change from $FILE{} to $FILE()
...
Otherwise, parsing e.g. '$FILE(myfile)'.find("stuff") will include
everything up to the last ) as the filename.
2012-09-29 21:16:13 +02:00
Daniel Hokka Zakrisson
be9d7df6c4
Allow multiline strings to work okay in only_if
...
Fixes issue #1137
2012-09-29 21:13:19 +02:00
Daniel Hokka Zakrisson
e655e2f051
Raise AnsibleError if $FILE() or $PIPE() fail
2012-09-29 21:09:57 +02:00
Lorin Hochstein
aa5ef9561d
ANSIBLE_CONFIG take precedence over ./ansible.cfg
2012-09-29 10:44:14 -04:00
Michael DeHaan
9377c3f525
Merge pull request #1130 from commandtab/templates-trim-blocks
...
Setting trim_blocks to True
2012-09-29 05:25:56 -07:00
Michael DeHaan
08a77135f3
Merge pull request #1126 from dagwieers/choices-fix
...
Fix to make sure only strings are being joined
2012-09-28 16:12:17 -07:00
Collin Allen
7c600ae0d3
Setting trim_blocks to True
2012-09-28 14:58:05 -07:00
Dag Wieers
27b2ae8ddc
Fix to make sure only strings are being joined
...
Since BOOLEANS also contains integers, joining the list returns an error. Easy to test by giving a wrong value to a boolean argument:
service name=httpd enabled=True
Since True is not in the allowed BOOLEANS, it will cause the error, which in its turn bails out because it joins strings and integers.
We may want to remove the integers from the choices since '0' and '1' are already in the list as strings. Personally I would expect only strings as arguments, not sure where these could be integers ??
2012-09-28 17:51:59 +02:00
Dag Wieers
c84e76e31d
Make sure we retain facts between playbooks
...
This is mandatory if we want to make facts-modules (like network_facts, ilo_facts and esx_facts) work.
2012-09-28 17:44:51 +02:00
Ralph Bean
d25ee940c4
Close zeromq context and socket.
2012-09-28 08:22:53 -04:00
Daniel Hokka Zakrisson
4b29c2cf74
Revert pull request #1091
...
Automatic quoting of variables in only_if breaks existing playbooks
where entire statements are put in a variable, and other cases. See
issue #1120 for details.
2012-09-28 13:58:23 +02:00
Michael DeHaan
618a519ee3
Merge branch 'varreplace-lessre' of git://github.com/dhozac/ansible into devel
2012-09-27 22:08:38 -04:00
Dag Wieers
e7af005408
Revert only_if for variables and templating prompt
...
Since the condition was not templated, it wasn't working.
Only variables in local scope were used, which made this not very practical
2012-09-28 01:32:09 +02:00