cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4804 commits 47 branches 390 tags 440 MiB
Commit graph

4374 commits

Author SHA1 Message Date
Michael DeHaan
df93d7dd97 Ignore inventory config files when using an inventory directory. 2013-04-19 19:01:19 -04:00
jtsoi
8c11624f14 Typo in example, extra space breaks playbook. 2013-04-19 22:43:50 +03:00
Michael DeHaan
8e7dc3c79c Remove an extra space in the module execution line if no environment was set. 2013-04-19 08:11:56 -04:00
Michael DeHaan
5656817776 Fixup authorized key documentation formatting 2013-04-18 22:43:14 -04:00
Michael DeHaan
cd0602889d Showcase the new-style lookup plugin access in the authorized_key docs rather than the old-style $FILE 2013-04-18 22:38:48 -04:00
Nathan L. Walls
e8f46822e5 Small spelling correction to authorized_key module docs 2013-04-18 22:16:28 -04:00
Seth Vidal
7b8cec3f59 clean up first_found to fix a few issues: 
- add a skip option so it won't raise an exception if you don't match anything
 - make it work as a drop-in replacement for first_available_file
 - document in the module comments all of the above cases
 2013-04-18 16:47:10 -04:00
Michael DeHaan
5f1e2afc34 Revert "make atomic_replace use shutil.copy2 instead of os.rename() so it will work across filesystems". 
AR function was leaving some tmp files behind, want to revert, will have better implementation soon, this is the old way now.

This reverts commit f74a1fa4f0.
 2013-04-18 15:46:42 -04:00
lwade
a154a5ddd4 correct reference to module 2013-04-18 10:36:07 +01:00
Michael DeHaan
d8bf87b008 (A) include errors in inventory scripts should they occur. 
(B) allow registration with ignore_errors: True
 2013-04-17 22:27:00 -04:00
Bernhard Weitzhofer
fb0a99e5d8 Fix if-statement that always evaluates True 2013-04-17 19:40:06 +02:00
C. Morgan Hamill
88eb5516eb Fix 'sequence' plugin error. 
If 'terms' is a string, replace it with a single item list.
 2013-04-17 11:45:28 -04:00
C. Morgan Hamill
663d37b537 Fix errors in lookup plugins. 
Lookup plugins 'sequence' and 'template' now import 'ansible.utils'
appropriately in order to use the 'listify_lookup_plugin_terms'
function.

Also, 'dnstxt' and 'env' now check to see if 'terms' is a string;
without this calls like '{{ lookup('env', 'HOME') }}' fail.
 2013-04-17 11:31:38 -04:00
Michael DeHaan
cce2cad8dc Fix with_sequence doc error 2013-04-16 20:42:06 -04:00
Michael DeHaan
500b9432a2 Merge pull request #2596 from blair/ec2_facts-provides-ec2-region 
ec2_facts: add ansible_ec2_placement_region key/value pair for EC2 regio...
 2013-04-16 17:28:13 -07:00
Dale Sedivec
515fd9e915 copy action plug-in check mode respects force=no 
The copy action accepts force=no, which tells it not to replace an
existing file even if it differs from the source.  The copy action
plug-in wasn't respecting this option when operated in check mode, so it
would report that changes are necessary in check mode even though copy
would make no changes when run normally.

Runner._remote_md5 was changed to make the logic for setting rc perhaps
a little more clear, and to make sure that rc=0 when the file does not
exist.
 2013-04-16 20:22:51 -04:00
Michael DeHaan
6cb6223deb Merge pull request #2608 from lwade/ec2zone 
Add availability zone parameter
 2013-04-16 17:20:55 -07:00
Michael DeHaan
22e3c389b3 Use platform.node() for the hostname, leave fqdn calculated the same way 2013-04-16 20:10:21 -04:00
Michael DeHaan
6a00513731 Add version added to module docs 2013-04-16 20:07:18 -04:00
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
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
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
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
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
Michael DeHaan
a05361f515 This is a fix on top of the 'airplane variable upgrade' commits that fixes legacy when_string so it evaluates correctly in the new eval construct. 2013-04-11 17:20:40 -04:00
Serge van Ginderachter
4a729ebf3a apt module: part rewrite of the upgrade logic, consistently checking 
the executable paths, adding 'safe' as an alias to yes, and adding
'full' to allow aptitude full-upgrade as an alternative to apt-get
dist-upgrade
 2013-04-11 23:03:47 +02:00
Michael DeHaan
3e58768344 Merge pull request #2646 from sevein/git-shallow-clone 
Add support for shallow clones in the git module
 2013-04-11 13:09:42 -07:00
Michael DeHaan
92ddab8a69 Merge pull request #2649 from sergevanginderachter/bin-ansible 
make bin/ansible error output consistent for shell module as for the command module when no arguments are given
 2013-04-11 12:33:12 -07:00
Michael DeHaan
3e736eaf00 Merge pull request #2622 from skvidal/playbook-start-at-task 
implement --start-at-task option to hop to a specific task before starti...
 2013-04-11 11:17:24 -07:00
Michael DeHaan
34bacc468c Merge pull request #2627 from jsmartin/riak 
Adds a riak module
 2013-04-11 11:14:32 -07:00
Serge van Ginderachter
94243e983f make bin/ansible error output consistent for shell module as for the command module when no arguments 2013-04-11 19:43:31 +02:00
Michael DeHaan
4e79bd0872 Remove unneccessary construction of Jinja2 environment object. 2013-04-11 12:59:33 -04:00
Michael DeHaan
b869551a4c Merge pull request #2628 from victorcoder/devel 
Typo in docs
 2013-04-11 09:57:38 -07:00
Michael DeHaan
2f5c1d3788 Merge pull request #2629 from stoned/fix-jinja2-filters-init 
Fix Jinja2 filter plugins initialization
 2013-04-11 09:57:04 -07:00
Michael DeHaan
11a819cc4b Merge pull request #2631 from stoned/templates-filters-base64 
Add base64 encode and decode filters to templates
 2013-04-11 09:49:27 -07:00
Michael DeHaan
a6777f7e7c Fix template call in group_by module. 2013-04-11 12:43:02 -04:00
Jesús García Crespo
62d7e6b006 Add --depth support in the git module 2013-04-11 09:40:15 -07:00
Michael DeHaan
a0a2ef3d9d Merge pull request #2640 from trevor/devel 
make json valid
 2013-04-11 09:35:46 -07:00
Michael DeHaan
7931597a6a Fix template call. 2013-04-11 12:15:13 -04:00
Trevor Wennblom
b779fa4fe9 make json valid 2013-04-10 23:43:16 -05:00
Michael DeHaan
0be04d2b57 Decided to not deprecate legacy template syntax for now. Backwards compat is important, though the docs will suggest the new way. 2013-04-10 19:21:35 -04:00
Michael DeHaan
695acc2de0 Make lookup plugins accessible in templates 2013-04-10 19:19:01 -04:00
Michael DeHaan
5b2035edd9 Changes for 'make pep8' 2013-04-10 19:12:10 -04:00
Michael DeHaan
81a926547c Some continued work on new-style templates and associated test code changes. Legacy template functions 
are marked with "legacy_" for possible future removal.
 2013-04-10 19:09:57 -04:00
Michael DeHaan
f0b21dcc0f allow references to names of variables in with_items without needing to surround them with Jinja2 '{{' delimeters 2013-04-10 18:42:54 -04:00
Michael DeHaan
9ac25bb8f6 Minor formatting 2013-04-10 18:19:31 -04:00
Michael DeHaan
d7206d84bb Allows Jinja2 that starts a YAML line to not cause a syntax error. 
Technically this isn't quite valid YAML when this happens, so we make it valid.  This means that if a future commander
API allows save/load it should make sure it does similar processing.
 2013-04-10 18:07:19 -04:00
Michael DeHaan
b09ef21ec9 Add code to flag legacy templating like $foo.{bar} as deprecated in favor of Jinja2 {{ foo.bar }} so we 
can remove the legacy system at a later date.
 2013-04-10 17:52:35 -04:00
Michael DeHaan
804056a563 Use Jinja2 strict undefined in string templating to allow the default filter to be used. 2013-04-10 16:45:53 -04:00
Michael DeHaan
998230a84a Allow $foo and {{ bar }} to be used on the same line in playbooks. 2013-04-10 16:40:49 -04:00
Michael DeHaan
29209c4913 Style fixes so "make pep8" is clean. 2013-04-10 16:37:49 -04:00
Michael DeHaan
0113951580 Enable usage of when_set within new eval system. 2013-04-10 16:26:59 -04:00
Michael DeHaan
a83e10d77d Use safe_eval vs eval. 2013-04-10 16:17:24 -04:00
Michael DeHaan
fecfbf9226 Allow jinja2 evals that produce lists to be used in with_items. Ideally want something a bit less heavy 
than the eval here.
 2013-04-10 15:22:08 -04:00
Michael DeHaan
e8085ad40c Since we removed the (undocumented) playbook include + with_items code, fix the tests to 
compensate.
 2013-04-10 15:08:18 -04:00
Michael DeHaan
c5d9823467 Fix some items related to playbook includes and indentation. 2013-04-10 15:04:41 -04:00
Stoned Elipot
0893562605 Add base64 encode and decode filters to templates 2013-04-10 02:30:31 +02:00
Michael DeHaan
290780d13f Playbook + with_items was an undocumented feature that was causing problems because it would 
evaluate and replace '$item' with ''.  Really it doesn't make sense to include multiple playbooks
via a loop variable, as you can do this with task + with_items already (and it's a simpler code
path).  Given this is undocumented, this removes that feature, and we'll consider next how to
also add 'with_items' support directly to roles.
 2013-04-09 20:13:55 -04:00
Serge van Ginderachter
5c0daf9e0a When saving to dest, check if we get redirected, and use the new 
location header to set the dest file name if we only provided a
target dir. Only save if dest not modified.
 2013-04-10 02:03:53 +02:00
Michael DeHaan
c64f19dc5f Don't set the item variable as eager template replacement will over-replace the variable as an empty string. 2013-04-09 19:57:53 -04:00