Daniel Hokka Zakrisson
be9d7df6c4
Allow multiline strings to work okay in only_if
...
Fixes issue #1137
2012-09-29 21:13:19 +02: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
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
Daniel Hokka Zakrisson
9e4fac5ebd
Create a string parser for varReplace instead of using re
...
This fixes a few issues,
- ${foo}${bar} would be parsed as a variable named foo}${bar,
which wouldn't be easily fixed without breaking ${foo.${bar}}
- allows escaping . in variable parts so e.g.
${hostvars.{test.example.com}.foo} works
This is slower than using re. 3 million templating calls take about
about twice as long to complete with this compared to the regexp,
from ~65 seconds to ~115 seconds on my laptop.
2012-09-28 01:03:34 +02:00
Michael DeHaan
6506e17eff
Merge pull request #1109 from dhozac/fix-varReplace-repr
...
Fix only_if statements referencing non-string types
2012-09-27 15:57:50 -07:00
Michael DeHaan
6c6f2b46b4
Merge pull request #1110 from dhozac/rm-assemble-ap
...
Remove assemble action plugin, fix daisychaining
2012-09-27 15:54:27 -07:00
Michael DeHaan
ee5246fc36
Merge pull request #1113 from jpmens/file_pipe
...
Strip trailing white space from $FILE()/$PIPE()
2012-09-27 15:54:09 -07:00
Jan-Piet Mens
42620d2f19
Strip trailing white space from $FILE()/$PIPE()
2012-09-27 23:47:34 +02:00
Daniel Hokka Zakrisson
b55ef665ba
Fix only_if statements referencing non-string types
...
This fixes e.g. only_if: ${task.changed} which would always
evaluate to true due to it having been replaced by a string for its
boolean value. Also adds a test case to ensure it doesn't get
missed again.
2012-09-27 18:36:52 +02:00
Daniel Hokka Zakrisson
66d0acfde3
Remove assemble action plugin, fix daisychaining
2012-09-27 18:30:08 +02:00
Aleksej Romanov
0db5ccfecb
Don't use ssh-agent if password is specified.
2012-09-27 14:57:06 +07:00
Michael DeHaan
69612ba16d
The very first start of 'fireball mode', which uses ansible in SSH mode to deploy a ephemeral zeromq daemon (entirely optional) that is will die after
...
it is no longer used. No key signing will be required. At this point, development use only -- NOT complete.
2012-09-26 23:51:59 -04:00
Michael DeHaan
c63189f650
Make output be cleaner on multi-line failed commands and parse errors.
2012-09-25 20:38:12 -04:00
Michael DeHaan
07101085ca
Merge pull request #1093 from brainpage/make_local_action_consistant
...
2 improvements to delegate_to
2012-09-25 17:17:33 -07:00
Daniel Hokka Zakrisson
84f98534ae
Make varReplace recursive instead of iterative
2012-09-25 20:14:58 -04:00
Daniel Hokka Zakrisson
d181a64315
Use repr on replacements for only_if
2012-09-25 20:14:58 -04:00
Michael DeHaan
489844f960
Merge pull request #1095 from pas256/devel
...
Getting negative host pattern matching to work with external inventory
2012-09-25 17:13:32 -07:00
Michael DeHaan
df147ab921
Merge pull request #1089 from tbielawa/runner_pause
...
Add 'pause' action plugin and support plugins skipping the host loop.
2012-09-25 17:11:54 -07:00
Peter Sankauskas
8a4e969b93
Getting negative host pattern matching to work with external inventory
...
(same as commit 4caf85e37b
, but for
excluded hosts as well as subsets)
2012-09-25 16:16:25 -07:00
Jonathan Palley
faed650bb1
allow vars in delegate_to
2012-09-26 03:47:17 +08:00
Jonathan Palley
620accf117
make delegate_to localhost act like local_action
2012-09-26 02:57:00 +08:00
Michael DeHaan
f8a9541405
add __init__ to action plugins
2012-09-25 08:24:35 -04:00
Michael DeHaan
730b617186
Add init, though it's not really used.
2012-09-25 08:21:59 -04:00
Michael DeHaan
8e71b26264
Fix up 'changed' playbook output patch
2012-09-25 08:07:11 -04:00
Dag Wieers
6b6e3c64c8
Fix a typo in the prompt code
...
This is unfortunately related to not being able to reuse the same code that was tested.
2012-09-25 11:51:33 +02:00
Tim Bielawa
58a4d2f7b4
Add 'pause' action plugin and support plugins skipping the host loop.
2012-09-25 01:13:35 -04:00
Michael Lambert
5dab2efcdf
Fixed obvious bug with missing self parameter to is_executable method
2012-09-24 21:03:45 -04:00
Michael Lambert
29ac1a8efc
Replace os.access with stat calls for determining the executability of a given path.
2012-09-24 21:03:45 -04:00
Michael DeHaan
734db4ffe9
Merge pull request #1080 from dagwieers/prompt-only_if
...
Add an only_if option to vars_prompt to make prompts conditional
2012-09-24 17:42:17 -07:00
Michael DeHaan
9778eaf4f9
Merge branch 'module_args-argument' of git://github.com/dhozac/ansible into devel
2012-09-24 20:39:48 -04:00
Dag Wieers
4e9a970616
Add an only_if option to vars_prompt to make prompts conditional
...
Sometimes you may want to allow variables through host_vars or inventory, but prompt for a value if it is not set or if the value does not conform to something specific. This option allows you to specify when you want to offer a prompt.
This patch also moves check_conditional to utils, and adds an is_unset() function which is nicer to read:
only_if: "not is_set('${var}')"
vs
only_if: "is_unset('${var}')"
2012-09-24 23:55:54 +02:00
Michael DeHaan
b355dca7dd
Merge pull request #1081 from dsummersl/changelabel
...
Modified 'ok' to 'changed' when a change has occured
2012-09-24 13:46:06 -07:00
Dag Wieers
069feb5d9c
Template the variable prompt to customize the message
...
We have a password-prompt for a configurable login name. Since we require to ask the password for this specific login, it is important to indicate what password needs to be prov ided on the prompt. So the prompt needs to be templated. That's what this patch does.
2012-09-24 22:37:51 +02:00
Dane Summers
04c535b1e9
Modified 'ok' to 'changed' when a change has occured
2012-09-24 16:07:56 -04:00
Daniel Hokka Zakrisson
34f7e6ffa0
Pass module arguments as argument instead of keeping it in runner
2012-09-23 23:38:26 +02:00
Michael DeHaan
3939f7a812
Merge pull request #1076 from SleeplessAnnoyedNerd/Issue-1075
...
[Issue #1075 ] Fixing setup module fails if PATH is not set on target hos...
2012-09-23 10:23:18 -07:00
Michael DeHaan
f5f17e98ff
Merge pull request #1065 from dhozac/varreplace-include
...
Allow including files through variables
2012-09-23 10:20:26 -07:00
Dietmar Schinnerl
78b7a3a115
[Issue #1075 ] Fixing setup module fails if PATH is not set on target host
2012-09-22 17:01:37 +02:00
Daniel Hokka Zakrisson
8d97bb4f8e
Add an ansible_ssh_host inventory variable
2012-09-22 00:57:55 +02:00
Michael DeHaan
4ded8cb3b3
Change $FILE{} and $PIPE{} to $FILE() and $PIPE()
2012-09-19 17:58:16 +02:00
Daniel Hokka Zakrisson
cc948f339c
Allow including files through variables
...
$FILE{file} will be replaced with the contents of "file"
$PIPE{cat file} will be replaced with the output of "cat file"
2012-09-19 17:57:17 +02:00
Michael DeHaan
b8c4bb9e6e
Revert "Allow including files through variables"
...
This reverts commit bf47bb4753
.
Conflicts:
lib/ansible/utils.py
test/TestUtils.py
2012-09-19 10:31:23 -04:00
Michael DeHaan
b2af95e4a6
Change $FILE{} and $PIPE{} to $FILE() and $PIPE()
2012-09-18 21:34:55 -04:00
Michael DeHaan
b25b9fd840
Merge pull request #1058 from jkleint/devel
...
Support iteration over command output in with_items.
2012-09-18 17:55:40 -07:00