Commit graph

3180 commits

Author SHA1 Message Date
Daniel Hokka Zakrisson
383dc30560 Rename varReplaceWithItems to template_ds 2012-11-09 15:43:29 +01:00
Michael DeHaan
35d841f780 Merge pull request #1569 from dagwieers/svr4pkg-doc-fix
Documentation of svr4pkg module breaks 'make rpm'
2012-11-08 17:47:25 -08:00
Dag Wieers
2fdb217be3 Documentation of svr4pkg module breaks 'make rpm'
Without this fix, generating documentation results in:

```
Traceback (most recent call last):
  File "hacking/module_formatter.py", line 376, in <module>
    main()
  File "hacking/module_formatter.py", line 365, in main
    text = template.render(doc)
  File "/usr/lib64/python2.6/site-packages/jinja2/environment.py", line 669, in render
    return self.environment.handle_exception(exc_info, True)
  File "hacking/templates/man.j2", line 20, in top-level template code
    {% for desc in v.description %}@{ desc | jpfunc }@{% endfor %}
  File "hacking/module_formatter.py", line 94, in man_ify
    t = _ITALIC.sub(r'\\fI' + r"\1" + r"\\fR", text)
TypeError: expected string or buffer
```
2012-11-09 02:22:20 +01: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
f3cbcecf53 Merge pull request #1563 from lllama/devel
Add an "executable" option to the command and shell modules
2012-11-08 16:45:48 -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
cbff02139f Merge pull request #1557 from sfromm/issue1412
Updates to git module: use git-fetch and other changes
2012-11-08 16:44:00 -08:00
Michael DeHaan
42375d14b3 Merge pull request #1556 from sfromm/issue1099
Wrap getpwnam in try/except in authorized_key module
2012-11-08 16:43:45 -08:00
Michael DeHaan
603a5a0803 Merge pull request #1555 from pas256/devel
Handle instances without keypairs
2012-11-08 16:43:30 -08:00
Michael DeHaan
b79b8e5a99 Merge pull request #1545 from brontitall/svr4pkg
Add svr4pkg module for traditional Solaris packages
2012-11-08 16:43:03 -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
Boyd Adamson
528a457848 Add svr4pkg module for traditional Solaris packages 2012-11-09 09:43:19 +11:00
fdavis
b91896ff55 move scp_if_ssh to the ssh connection category 2012-11-08 11:51:24 -08:00
Felix Ingram
e0f0e8c023 Add an "executable" option to the command and shell modules
The option will be passed to the Popen object created and will be used to
execute the command instead of the default shell.
2012-11-08 13:56:16 +00: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
Peter Sankauskas
39efcd0766 While I haven't done this, it is possible to bring up an instance
without a keypair, so this takes care of that scenario
2012-11-07 16:56:45 -08:00
Stephen Fromm
3ec64d19a8 Wrap getpwnam in try/except in authorized_key module
This also adds module as an argument to keyfile().
2012-11-07 16:43:09 -08:00
Stephen Fromm
6aa51a7cf3 Rewrite switch_version() to detect branch
Rewrote switch_version() to read .git/HEAD to find branch associated
with HEAD.  If in a detached HEAD state, will read
.git/refs/remotes/<remote>/HEAD.
2012-11-07 16:33:22 -08:00
Michael DeHaan
36c1b4be0e Merge pull request #1554 from dagwieers/rpm-name-fix
Fix broken RPM names due to static _rpmfilename
2012-11-07 16:22:07 -08:00
Dag Wieers
d4b6aecd97 Fix broken RPM names due to static _rpmfilename 2012-11-08 00:09:18 +01:00
Michael DeHaan
ab0f972715 Merge pull request #1553 from dagwieers/doc-authorized_key-fix
Fix example where imported ssh keys contain spaces
2012-11-07 15:00:07 -08:00
Michael DeHaan
710b49de4b Merge pull request #1552 from dagwieers/invoked-fix
Only print 'Invoked with' if there are arguments to the module
2012-11-07 14:59:36 -08:00
Dag Wieers
2bccd7b1ac Fix example where imported ssh keys contain spaces
This fixes #1521
2012-11-07 23:58:16 +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
Michael DeHaan
5e024243a8 Merge pull request #1522 from dhozac/LOOKUP-templating
Add $LOOKUP(<lookup plugin>,<data>) as a templating option
2012-11-07 14:26:07 -08:00
Daniel Hokka Zakrisson
43419d7b20 Add tests for lookup plugins 2012-11-07 23:21:26 +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
176cc8380b Merge pull request #1524 from nigelm/devel
Split of rpm packaging into main/fireball/node-fireball
2012-11-07 13:55:29 -08: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
Michael DeHaan
612aed55bb Merge pull request #1546 from dagwieers/get_url-nonthirsty-fix
Don't require thirsty mode for directory destination
2012-11-07 13:51:38 -08:00
Michael DeHaan
0ed2595bc6 Merge pull request #1548 from dagwieers/inventory-host-exception
Fix for an exception when for whatever reason the inventory script fails
2012-11-07 13:51:12 -08:00
Michael DeHaan
43410c46f9 Merge pull request #1550 from bcoca/1549_lininfile_backup_bug
fixes #1549
2012-11-07 13:50:54 -08:00
Stephen Fromm
49d41da152 Use supplied remote name when cloning git repository 2012-11-07 12:15:22 -08:00
Stephen Fromm
328951ef53 Checkout branch before rebase in switch_version 2012-11-07 11:44:48 -08:00
Stephen Fromm
ccc04cf891 More work in git module
Rename pull() to fetch().  It does a git fetch and then a
git fetch --tags.
Add _run() method to handle all subprocess.Popen calls.  Change
all previous calls to subprocess.Popen to use _run().
2012-11-07 11:44:48 -08:00
Brian Coca
5ea260f44b fix case in which file is created and backup is requested but fails, not it just doesn't attempt to backup the missing file
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2012-11-07 10:33:43 -05: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
Dag Wieers
82ec405b05 Don't require thirsty mode for directory destination
There is no need to require thirsty mode when the destination is a directory. We add the basename of the url to the destination directory and proceed with that. If that file exists in non-thirsty mode continue as expected.

I also cleaned up some of the logic that is no longer necessary if we simply rewrite the destination from the very start the way it is expected.
2012-11-07 14:16:48 +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
Michael DeHaan
8bd56926f1 Merge pull request #1544 from pas256/devel
Adding more instance groups
2012-11-07 04:06:02 -08:00
Michael DeHaan
7cd013f854 Merge pull request #1542 from arrfab/xen-fact-issue
Fixed the way dom0/domU xen role is defined in the setup module
2012-11-07 04:05:38 -08:00
Peter Sankauskas
aa0434535e Adding 2 more groups of instances - instance types and key pairs 2012-11-06 16:16:52 -08:00
Fabian Arrotin
29882f97e6 Fixed the way dom0/domU xen role is defined in the setup module 2012-11-06 22:49:33 +01:00
Michael DeHaan
1b8d912d2a Merge pull request #1541 from dhozac/fix-first_available_file
Fix first_available_file and add test-case
2012-11-06 12:45:11 -08:00
Daniel Hokka Zakrisson
40af8eff14 Add testcase for first_available_file 2012-11-06 20:57:35 +01:00