Michael DeHaan
7c6341718e
Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp
...
Conflicts:
lib/ansible/inventory/vars_plugins/group_vars.py
lib/ansible/runner/__init__.py
lib/ansible/utils/__init__.py
test/TestPlayBook.py
2013-04-16 20:06:06 -04:00
C. Morgan Hamill
863cb50530
Allow '.yml'/'.yaml' extension on group_vars files.
...
Look for a file with the base name of the group/host, first without
a file extension, then with a '.yml' extension, and, finally, with
a '.yaml' extension, loading vars from only the first one found.
2013-04-16 19:59:23 -04:00
Michael DeHaan
454076590c
Merge pull request #2580 from blair/ec2_vol-improvements
...
Ec2 vol improvements
2013-04-16 16:58:54 -07:00
Michael DeHaan
6d66b0e965
Merge pull request #2692 from j2sol/rax
...
Minor fixes to the rax module
2013-04-16 16:52:43 -07:00
Michael DeHaan
b54e955595
Remove a debug statement.
2013-04-16 19:09:12 -04:00
Michael DeHaan
86d47bce5f
Make more lookup plugins tolerant of new variable system, with a little better 'do what I mean' logic to resolving
...
what happens if you get a string back as a template result.
2013-04-16 19:07:19 -04:00
Michael DeHaan
c0f8af5202
Make more lookup plugins happy with newstyle variables. Not quite done, but this fixes up with_items/with_nested/file/fileglob.
2013-04-16 18:50:30 -04:00
Michael DeHaan
f72649d0f9
Merge pull request #2698 from skvidal/atomic_replace_and_cron
...
Atomic replace and cron
2013-04-16 12:53:41 -07:00
Seth Vidal
f74a1fa4f0
make atomic_replace use shutil.copy2 instead of os.rename() so it will
...
work across filesystems
2013-04-16 15:15:58 -04:00
Seth Vidal
5df2dadcdb
clean up how it puts the files in place - in f18 /tmp is tmpfs which
...
means ln and os.rename() won't work across fs.
2013-04-16 15:08:27 -04:00
Jesse Keating
59d0fb6c95
Only accept supported services for rax module
...
Even though others are possible, fail early on unsupported ones.
2013-04-15 17:22:42 -07:00
Jesse Keating
55ef1d6e47
Update documentation for rax module
...
Only list the services supported
Don't put in unncessary required: false
Use better formatting for the example
2013-04-15 17:20:45 -07:00
Michael DeHaan
84fb92dac6
Working on the FAQ.
2013-04-14 19:32:06 -04:00
Michael DeHaan
d00f7cea14
Merge pull request #2676 from b6d/postgresql_privs-module-proposal2
...
Proposal for a module to manage PostgreSQL privileges (2)
2013-04-13 18:51:03 -07:00
Michael DeHaan
375dd0e16b
Merge pull request #2673 from b6d/user-module-extension
...
user module: return public SSH key
2013-04-13 15:07:32 -07:00
Bernhard Weitzhofer
210d711553
Add module postgresql_privs
...
This Module allows to manage privileges on PostgreSQL database objects
(currently: tables, sequences, functions, databases, schemas, languages and
tablespaces) as well as group role memberships.
It is basically a wrapper around most of the functionality of PostgreSQL's
GRANT and REVOKE statements with additional detection of changes and support
for dry-runs (check-mode).
postgresql_privs should work with PostgreSQL 8.4 and above. Python Module
psycopg2 is required on the remote host.
2013-04-13 22:56:18 +02:00
Bernhard Weitzhofer
c2a7314a5f
user module: return public SSH key
...
Return public SSH key if the user module is called with generate_ssh_key=yes.
Since "user" doesn't overwrite files, this also allows querying of existing
public keys.
Used in playbooks together with the "register" keyword, the returned key can be
passed to the "authorized_key" module allowing easy setup of SSH public key
authentication between remote hosts.
2013-04-13 16:10:58 +02:00
Michael DeHaan
96d014581a
Merge pull request #2605 from b6d/postgresql_user-quote-pwd
...
Use psycopg2's string handling to escape password string
2013-04-12 20:44:32 -07:00
Michael DeHaan
2da036046b
Merge pull request #2670 from jsmartin/devel
...
Errors in Riak documentation.
2013-04-12 20:23:20 -07:00
James Martin
7609c5e0d0
Errors in documentation.
2013-04-12 22:26:18 -04:00
Michael DeHaan
0944e7d56a
Make less template calls on playbook objects.
2013-04-12 21:48:01 -04:00
Michael DeHaan
728d81bf12
Add link to prior docs version.
2013-04-12 21:48:00 -04:00
Michael DeHaan
be917e3e54
Merge pull request #2667 from jsmartin/devel
...
Added catch-all exception for riak stats collection.
2013-04-12 18:25:19 -07:00
Michael DeHaan
62fe4cc3af
Explain conditionals as applied to roles. I could also explain with_items but the scope questions are complex
...
here, and it is better to include such loops inside the imported tasks.
2013-04-12 20:46:12 -04:00
Michael DeHaan
44a9352338
Also template handlers only at the end.
2013-04-12 20:32:35 -04:00
James Martin
93d0ccd1e1
Added catch-all exception for stats collection.
2013-04-12 20:28:39 -04:00
Michael DeHaan
e7f5186dec
Merge pull request #2623 from willthames/when_set_bug
...
Prevent premature variable substitution in tasks
2013-04-12 17:19:25 -07:00
Michael DeHaan
3ab0ed5fd4
Allow 'when' and 'with_items' to be applied to roles.
2013-04-12 19:02:56 -04:00
Michael DeHaan
7a2d493e67
Teach lookup plugins that if they can't evaluate something they can wait and do it later.
2013-04-12 18:44:40 -04:00
Michael DeHaan
3f3b2a9448
Smush Jinja2 braces in playbooks so unresolved variables get parsed nicely
2013-04-12 18:38:48 -04:00
Michael DeHaan
687a68091f
Mention roles in best practices
2013-04-12 18:26:17 -04:00
Michael DeHaan
ffb00d2071
Favor {{ foo }} rather than $foo in documentation.
2013-04-12 18:21:09 -04:00
Michael DeHaan
9ed246e432
Resolve merge conflict.
2013-04-12 17:51:55 -04:00
Michael DeHaan
26819d707d
Reorganize docs structure to support snapshots.
2013-04-12 17:50:50 -04:00
Michael DeHaan
e63dac15eb
Moving some more files into snapshot directory
2013-04-12 17:47:04 -04:00
Michael DeHaan
148d8859ba
Docs on parameterized roles, make document generation output less noisy
2013-04-12 17:45:27 -04:00
Ivan Lezhnjov IV
b25e537e7d
Fixes wrong Source URL
...
Signed-off-by: Ivan Lezhnjov IV <ivan.lezhnjov.iv@gmail.com>
2013-04-12 13:26:33 -07:00
Ivan Lezhnjov IV
a379e7ed72
Updated ansible.spec should now work for CentOS 5 and CentOS 6
...
Signed-off-by: Ivan Lezhnjov IV <ivan.lezhnjov.iv@gmail.com>
2013-04-12 13:14:03 -07:00
Michael DeHaan
7037023aa8
Make debug print things nicer if {{ foo }} didn't interpolate
2013-04-12 15:02:54 -04:00
Michael DeHaan
06b988e2d5
Create the .ssh dir if it does not already exist.
2013-04-12 14:46:41 -04:00
Michael DeHaan
793a3d3f76
More 1.2 templating development; for legacy when_string constructs don't quote the 'in' operator
2013-04-12 13:29:49 -04:00
Blair Zajac
5d0f78d571
ec2_facts: add ansible_ec2_placement_region key/value pair for EC2 region.
2013-04-12 09:04:12 -07:00
Michael DeHaan
85099be48f
Merge pull request #2656 from dstoflet/first_available_file_fix
...
Quick fix for first_available_file and role support
2013-04-12 08:56:26 -07:00
Michael DeHaan
b8c5a58b7f
Avoid running through the legacy template code if no dollar signs are in strings.
2013-04-12 10:33:55 -04:00
Michael DeHaan
251f19263c
Remove unneeded import.
2013-04-12 10:23:53 -04:00
Michael DeHaan
8457cf433d
Update pause module to not use utils.template
2013-04-12 10:00:20 -04:00
Darryl Stoflet
c63207bf75
Quick fix for first_available_file and roles
2013-04-11 20:40:23 -07:00
willthames
377bc31311
Prevent premature substitution of variables into tasks
...
As documented in #2623 , early variable substitution causes when_
tests to fail and possibly other side effects.
I can see the reason for this early substitution, likely introduced
in 1dfe60a6
, to allow many playbook parameters to be templated.
This is a valid goal, but the recursive nature of the utils.template
function means that it goes too far.
At this point removing tasks from the list of parameters to be
substituted seems sufficient to make my tests pass. It may be the
case that other parameters should be excluded, but I suspect not.
Adding a test case. I would prefer to analyse not just the aggregate
statistics but also whether the results are as expected - I can't
see an easy way to do that with the available callbacks at present.
2013-04-12 09:17:03 +10:00
Serge van Ginderachter
684cfecda9
package and upgrade are not mutually exclusive, but when both were set, upgrade didn't happen
2013-04-11 23:58:15 +02:00
Serge van Ginderachter
d3dee7a8a2
add default=yes in upgrade argument spec
2013-04-11 23:43:35 +02:00