ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
9222 commits 10 branches 167 tags 272 MiB
Commit graph

2498 commits

Author SHA1 Message Date
Brian Coca
460bbfaec1 added union filter 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-11-19 14:40:55 -05:00
Brian Coca
afe30a6633 added difference and symetric difference filters 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-11-19 00:06:38 -05:00
Michael DeHaan
fc909b453f Make the legacy template detection system not hit a false positive when 
replacing a \$ with $.
 2013-11-18 17:51:57 -05:00
jctanner
93223510af Merge pull request #4936 from stoned/group-get_hosts-perf2 
Improve Group.get_hosts() performance.
 2013-11-18 14:13:08 -08:00
Matt Haggard
389602b8dd Merge pull request #4920 from iffy/ansible 
Collect all stdout over ssh transport before returning data
 2013-11-18 15:09:21 -05:00
Michael DeHaan
f18acee779 Merge pull request #4937 from skyl/synchronize-keyerror 
KeyError: 'delegate_to' lookup in sync module needs to be checked to see if defined for ad hoc
 2013-11-18 11:40:27 -08:00
James Tanner
e8b54dd073 Fixes #4852 properly evaluate log_path writability 2013-11-18 10:40:49 -05:00
Skylar Saveland
7bc64581d7 KeyError: 'delegate_to' no more 2013-11-17 21:26:17 -08:00
Stoned Elipot
b00bf02129 Improve Group.get_hosts() performance. 
- reduce hosts group list to unique elements faster
- add a cache of already computed hosts group list
 2013-11-18 03:48:55 +01:00
jctanner
009fdbf96a Merge pull request #4896 from mjschultz/aws-access-keys 
Check for AWS keys using boto names
 2013-11-14 12:59:07 -08:00
jctanner
04847191b4 Merge pull request #4879 from bcoca/unique_intersect 
added unique and intersect filters for dealing with lists
 2013-11-14 12:46:50 -08:00
jctanner
0f0a89b34e Merge pull request #4758 from alanfairless/group-host-var-dirs 
Support organizing group and host variables across multiple files in a directory
 2013-11-14 11:57:11 -08:00
jctanner
77affdefbc Merge pull request #4585 from mscherer/connec_func 
connection plugin to reuse the func/certmaster interface instead of ssh
 2013-11-14 08:15:17 -08:00
jctanner
be67a6f815 Merge pull request #4625 from pileofrogs/devel 
unarchive module & action plugin
 2013-11-14 07:57:57 -08:00
jctanner
e4494be8c6 Merge pull request #4803 from dragon3/devel 
Don't fail if ec2_access_key/ec2_secret_key not specified to use IAM rol...
 2013-11-14 05:55:48 -08:00
Michael J. Schultz
5f9485499c Check for AWS keys using boto names 
- see https://github.com/boto/boto#getting-started-with-boto
 2013-11-13 16:01:39 -06:00
James Tanner
33242cacf3 Merge pull request #4375 from pfalcon/ansible 
copy: Implement recursive copying if src is a directory.
 2013-11-13 15:52:40 -05:00
jctanner
9a7765daf7 Merge pull request #4351 from 2m/leading-range-fix 
Allow leading ranges in the inventory host entries.
 2013-11-13 10:48:57 -08:00
jctanner
6dd81f25d9 Merge pull request #4856 from akuznecov/devel 
Resolves #4855 issue with synchronize module failing on multiple items
 2013-11-12 15:37:26 -08:00
James Tanner
f31cb7c6e8 Merge pull request #4664 from jpmens/ansible 
Lookup plugin for etcd

with support for configurable etcd URL in ansible.cfg (and environment)
 2013-11-12 15:29:05 -05:00
James Tanner
dc41bb8085 Merge pull request #4207 from ashorin/ansible 
Fail playbook when serial is set and hadlers fail on set.
 2013-11-12 14:37:07 -05:00
jctanner
2cf335969f Merge pull request #4738 from bcoca/assemble_action_plugin 
assemble can now use src from master/origin
 2013-11-12 08:23:39 -08:00
Brian Coca
efd87534eb added unique and intersect filters for dealing with lists 
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
 2013-11-12 10:34:57 -05:00
James Tanner
6e49ee6cfc Remove commented code block 2013-11-11 14:44:13 -05:00
James Tanner
288c33e286 Merge pull request #4078 from mkaluza/ansible 
add 'chars' parameter to password plugin to allow custom character set
 2013-11-11 14:30:49 -05:00
jctanner
0c29807ba3 Merge pull request #3993 from stoned/inventory-script-all-group-fix 
Avoid duplicates of the 'all' group when using inventory script.
 2013-11-11 10:42:00 -08:00
Marcus Cobden
8d98a55df1 Fix setup.py to work with 'pip install -e .' 2013-11-11 14:00:38 +00:00
Serge van Ginderachter
80fd22dce6 Check real user's known_hosts when sudo ansible... 
closes #4834
 2013-11-09 13:29:39 +01:00
James Tanner
74e7eba528 Fixes #4506 test length of context before checking invalid indexes 2013-11-08 13:17:02 -05:00
Alexander Kuznecov
9d2f9bf93c resolves #4855 2013-11-09 00:14:55 +07:00
jctanner
8e8c8efc8f Merge pull request #4769 from alanfairless/more-password-entropy-revised 
Revised patch for more password entropy
 2013-11-07 13:39:05 -08:00
jctanner
f51b8ffde9 Merge pull request #4836 from dekked/devel 
Bug fix: support running handlers parametrized by name
 2013-11-07 13:18:33 -08:00
James Tanner
898de833b0 Merge pull request #4413 from jerm/ansible 
Add capability to pass in a PATH prefix to run_command and allow pip module
to utilize that to make virtualenv bin/ available in pip installs
 2013-11-07 15:51:27 -05:00
Alan Descoins
bb6f02d0e8 Support running handler parametrized by name. 2013-11-07 16:54:06 -02:00
jctanner
8d9b53b445 Merge pull request #4733 from sivel/4323-sudo-pass 
Add ansible_sudo_pass hostvar support. Fixes #4323
 2013-11-05 15:01:19 -08:00
James Tanner
d93780bc8a Addresses #4635 add list instead of join 2013-11-05 14:44:27 -05:00
James Tanner
2b5005687a Fixes #4635 pass role conditionals to dependent roles 2013-11-05 14:38:21 -05:00
James Tanner
91aa7b51df Remove invalid ipv6 parameter from setup execution 2013-11-04 17:23:32 -05:00
James Tanner
c1ed47933b Fixes #4485 add an ipv6 parameter to accelerate so that the daemon will bind to an ipv6 port instead of ipv4 2013-11-04 17:20:03 -05:00
dragon3
ff5bd7fe06 Don't fail if ec2_access_key/ec2_secret_key not specified to use IAM role. 2013-11-04 23:41:44 +09:00
willthames
76c810afe3 AWS_ACCESS_KEY misspelt in shared EC2 connection library 2013-11-04 15:24:53 +10:00
Michael DeHaan
eab6737209 Clarify a warning message. 2013-11-03 12:47:07 -05:00
Michael DeHaan
70c9028e1e include_vars plugin should look in vars/ path for a role. 2013-11-02 09:34:44 -04:00
Michael DeHaan
99687749a3 Merge pull request #4775 from steverweber/fix-4640 
dont sudo if sudo_user is the same as the connection user
 2013-11-01 15:27:55 -07:00
Steve Weber
5bd52796ec dont sudo if sudo_user is the same as the active user 2013-11-01 14:19:33 -04:00
James Tanner
afa5988391 Fixes #4540 Use shared module snippet to evaluate ec2 credentials 2013-11-01 11:59:24 -04:00
Alan Fairless
0824f004d9 Revised patch for more password entropy 2013-11-01 09:51:35 -05:00
James Tanner
dc4d589ce0 Fixes #4767 detect hard links and set state in add_file_info 2013-11-01 09:41:22 -04:00
Michael DeHaan
b1b5280075 Reapply pep8 changes from previous revert. 2013-10-31 19:47:44 -04:00
Michael DeHaan
51fbc6d20a Further simplify the debug: var=foo action plugin code. 2013-10-31 19:39:32 -04:00
Michael DeHaan
bbf212a268 Simplify the way the debug: var=varname plugin works. 2013-10-31 19:35:50 -04:00
Michael DeHaan
7f125567cb Some simplification of include_vars and renamed include_files to include_vars. 2013-10-31 19:24:35 -04:00
Michael DeHaan
b69ab89eb1 Merge branch 'include_files' of git://github.com/bennojoy/ansible into devel 2013-10-31 19:14:27 -04:00
Michael DeHaan
465f3b1c91 This allows type=dict in a module to allow passing in a real dict or JSON. 2013-10-31 18:46:13 -04:00
Michael DeHaan
8b2cd6413b When inside an apt or yum task account for multiple conditionals. Fixes 4745. 2013-10-31 17:19:58 -04:00
Michael DeHaan
d34a26e307 Undo an inadvertant revert from template changes so we still allow pythonic imports in module land. 2013-10-31 16:53:05 -04:00
Alan Fairless
65e5331079 Allow organizing host/group vars in a directory 
So instead of having:
 group_vars/production.yml

A user could chose to reorganize to:
 group_vars/production/staff.yml
 group_vars/production/networks.yml
 group_vars/production/dns.yml

(Backwards compatible.)
 2013-10-31 12:22:46 -05:00
Alan Fairless
babde9a84c refactor to catch edge cases, remove repeated code 
- Move all the supported YAML file extensions into a constant
- Use helper functions to avoid duplicate code for group/host vars
- Catch and disallow some confusing situations, such as the presence of
  multiple group/host vars files for the same group/host, but with
  different extensions.  For example having both group_vars/all.yml and
  group_vars/all.yaml.
- Catch and report file system permission issues, symlink errors,
  unexpected file system objects
- Trivial performance improvement from making fewer stat system calls
- Restructuring that makes it easy for a following patch to support
  directory recursion
 2013-10-31 12:18:17 -05:00
Brian Coca
ac40d15120 now assemble module is also action plugin and can use local source for 
files
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-10-30 21:40:42 -04:00
Michael DeHaan
7b331ef6ed Fix code typo. I'll blame jet lag for now :) 2013-10-30 21:28:47 -04:00
Michael DeHaan
90cce35919 This allows variable references in playbooks in a different way. 2013-10-30 21:26:16 -04:00
Michael DeHaan
b5c9d5a59b Inventory directory should always be absolute. Fixes #4535. 2013-10-30 20:48:53 -04:00
Michael DeHaan
7201a6ffad Evaluate the conditional for each item for modules that normally try to group with_items results 
like yum and apt.
 2013-10-30 20:35:33 -04:00
James Tanner
078aaa95a2 Revert 1f6edf7d76 and re-enable passing lists to yum and apt 2013-10-30 20:17:17 -04:00
Matt Martz
ea2ec6237a Add ansible_sudo_pass hostvar support 2013-10-30 13:18:35 -05:00
James Tanner
d154bf8781 Revert templating enhancements from 73dbab70 e6c28658 d409352c 9858b1f2 4587528b 9b1fe455 214b0b05 8d3db803 7f9504d1 5031104c 35cb9dc2 2bd8cb57 1e85c754 2013-10-30 10:50:16 -04:00
James Tanner
0faecdf7d1 Fixes #4653 Set dest on results for copy module even if using file module 2013-10-28 22:50:55 -04:00
James Tanner
9249cf578d Fixes #4572 Run until loop if until is set, ignoring result failures 2013-10-28 12:56:46 -04:00
Michael DeHaan
73dbab702f Don't run lookup plugins while trying to simplify the input datastructure. 2013-10-28 09:08:53 -04:00
Michael DeHaan
6d0da41a55 No need to template modules with Jinja2 as this can confuse some docstring comments. 2013-10-28 08:18:24 -04:00
bennojoy
b53e7353f9 include files 2013-10-28 17:40:09 +05:30
Michael DeHaan
603db60828 Merge pull request #4288 from sivel/3725-regex 
Add regex (search, match, regex) jinja2 filters. Fixes #3725
 2013-10-27 08:48:12 -07:00
Michael DeHaan
4587528b99 Fix typo in comment. 2013-10-26 19:32:07 -04:00
Michael DeHaan
d409352c85 Remove some interior imports in the code. Not really needed but nice to have them gone. 2013-10-26 19:26:43 -04:00
Michael DeHaan
e6c28658b4 Add in some code to pre-template datastructures prior to template usage. This prevents a certain class of error 
where filter evaluations can happen too early due to the template engine recursion being a bit limited.

Addresses #4662
 2013-10-26 19:11:13 -04:00
Michael DeHaan
f05a3a81f9 Add missing file. 2013-10-26 11:39:22 -04:00
Michael DeHaan
54c902f102 Identation + misc PEP8 fixes. 2013-10-26 11:18:11 -04:00
Michael DeHaan
bbb359870e Add package file. 2013-10-26 11:10:54 -04:00
Michael DeHaan
9858b1f2f3 Enable imports to work on a snippet based system, allowing for instance a library of common EC2 functions 
to be reused between modules.  See library/system/service and library/system/ping for initial examples.  Can
work the old way to just import 'basic', or can import the new way to import multiple pieces of code from
module_utils/.
 2013-10-26 11:09:30 -04:00
jctanner
43f48a2e02 Merge pull request #4167 from tima/rsync3 
synchronization module take 3
 2013-10-25 14:43:08 -07:00
James Tanner
40886c42b5 Fixes #4561 Compare task name without role prefix for start-at-task 2013-10-25 16:09:43 -04:00
James Tanner
1f6edf7d76 Fixes #4665 and #4666 If task is conditional do not flatten items list for packaging modules 2013-10-25 13:46:41 -04:00
James Tanner
9b1fe455c6 Fixes #4549 Do not call lookup plugins when templating a task's name 2013-10-25 10:27:38 -04:00
Serge van Ginderachter
6277e770a1 include basedir as 'playbook_dir' variable 
closes #4246
 2013-10-25 07:53:52 +02:00
Jan-Piet Mens
bd5cd8e652 Lookup plugin for etcd 
with support for configurable etcd URL in ansible.cfg (and environment)
 2013-10-24 21:28:48 +02:00
James Tanner
b803aac6ec Fixes #4500 change ec2 module params to type=bool 
Revert 4833c2fdf0
 2013-10-24 09:19:25 -04:00
James Cammarata
b9dd514713 Minor fix for putting 0-length files over accelerated connections 
Fixes #4652
 2013-10-23 13:09:25 -07:00
James Tanner
4833c2fdf0 Fixes #4500 python bools return uppercase True and False, so allow those for BOOLEANS in module common 2013-10-23 15:54:36 -04:00
James Tanner
214b0b052c Fixes #4608 add lookup to template globals to make plugins work again 2013-10-22 12:00:54 -04:00
Dylan Martin
2c28e1daea unarchive module & action_plugin added 2013-10-21 15:22:42 -05:00
James Tanner
4f13967386 Fixes #4536 Get the remote_user from multiple sources in a preferred order 2013-10-21 12:07:51 -04:00
Timothy Appnel
cbae9c913e synchronize module src and dest handles template markers. 2013-10-19 22:39:25 -04:00
Michael DeHaan
60944b81f0 Provide warning about "with_items: '{{ loop }}'" being redundant only when {{ starts the expression value. Fixes #4582. 2013-10-19 14:24:12 -04:00
Michael DeHaan
2bd8cb5790 Make the deprecation detector in templates more accurate. Fixes #4514. 2013-10-19 14:14:16 -04:00
Michael DeHaan
4125b05bf3 Allow a defaults file to solely define a role. Some typo fixes. 2013-10-19 14:01:20 -04:00
Michael DeHaan
64bbeb9d24 Suggest fixing unbalanced quotes in a bit less cases. Fixes #4501 2013-10-19 13:57:28 -04:00
Michael DeHaan
7f9504d14d Fix a typo. 2013-10-19 13:52:48 -04:00
Michael DeHaan
8d3db80370 Some misc cleanup and removal of unused imports. 2013-10-19 13:50:14 -04:00
Michael DeHaan
21d4400c96 Misc pep8 fixes 2013-10-19 13:03:15 -04:00
Michael DeHaan
c933a4c59a Fix indentation depth. 2013-10-19 13:03:14 -04:00
Michael DeHaan
5031104c3a Finishing touches on template cleanup. 2013-10-19 11:40:48 -04:00
Michael DeHaan
1e85c7544b Further WIP on template cleanup. 2013-10-19 11:39:52 -04:00
Michael DeHaan
35cb9dc22f Work in progress about cleaning up template code. 2013-10-19 11:39:52 -04:00
Michael Scherer
af796d6556 connection plugin to reuse the func/certmaster interface instead of ssh 
This plugin permit to use func to run playbook and ansible command instead
of ssh. It can be used for a smooth transition from func/taboot to ansible by
letting people use ansible without having to change their network architecture.
 2013-10-19 00:32:59 +02:00
Brian Coca
c476ed93ca now correctly changes script permission in all cases 
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
 2013-10-18 16:52:15 -04:00
James Tanner
8478e82647 Fixes #4583 enforce that vars_files is a list 2013-10-18 11:19:16 -04:00
Michael DeHaan
b0f6e77f66 Merge pull request #4571 from tgerla/whitespace 
add_group module: strip trailing/leading whitespace from comma-separated group names
 2013-10-17 16:09:09 -07:00
Tim Gerla
51a1709253 add_group module: strip trailing/leading whitespace from comma-separated group names 2013-10-17 14:13:55 -07:00
James Tanner
242f20c297 Fixes #4402 wrong order for isinstance parameters in dnstxt.py 2013-10-17 15:43:39 -04:00
Martynas Mickevicius
7ecb5fbc9c Handle comment on inventory group line. 2013-10-17 13:16:35 +03:00
Martynas Mickevicius
44279ce34f Allow leading ranges in the inventory host entries. 2013-10-17 13:16:35 +03:00
jctanner
6480945184 Merge pull request #4541 from Kami/improve_template_render_error_messages 
Make errors which get thrown during template rendering more user-friendly
 2013-10-16 17:52:07 -07:00
Stoned Elipot
4430d0f5a6 when searching for a plugin only look for a regular file 2013-10-16 21:23:37 +02:00
Tomaz Muraus
922f61899e Throw a more user-friendly exception during template rendering process. 2013-10-16 16:48:17 +02:00
Gabe Mulley
84a57b7545 ensure non-root users can read arguments file when using sudo_user 
Non-standard modules must read in the arguments file in order to access their arguments, however, when this file is transfered to the remote host it may only have the permissions 600.  This means that using sudo and sudo_user will result in permission denied errors when attempting to read the arguments file.

This patch fixes #4438 by explicitly forcing the arguments file to be world readable before executing the module.
 2013-10-16 08:18:11 -04:00
Brian Coca
bd9acedb57 fixed name colision between warnings dict and module 
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
 2013-10-15 14:58:15 -04:00
Paul Sokolovsky
2e668f14f7 copy: Handle "no copy/propagate attrs only" for recursive mode well. 
For this, add internal "original_basename" param to file module,
similar to copy module. (Param name is a bit misnormer now, should
be treated as "original basepath").
 2013-10-15 18:40:40 +03:00
Paul Sokolovsky
ce88df3cf4 copy: Handle dest path variations for recursive mode. 2013-10-15 18:40:39 +03:00
Paul Sokolovsky
6cf3975e2e copy: Set suitable default result for check mode. 2013-10-15 18:40:39 +03:00
Paul Sokolovsky
612b446856 copy: Don't modify input module_args in a recursive file handling loop. 2013-10-15 18:40:39 +03:00
Paul Sokolovsky
b3b4f9885f copy: Implement recursive copying if src is a directory. 
If src param to copy is a directory, all files under it are collected
and pushed one by one to target. Source dir path handled in a way
simalar to rsync: if it ends with slash, only inside contents of
directory are copied to destination, otherwise the dir itself is
copied (with all contents of course). Original idea and implementation
by https://github.com/ansible/ansible/pull/1809 . Rewritten to address
review comments and simplify/correct logic.
 2013-10-15 18:40:39 +03:00
jctanner
69fa5954fd Merge pull request #3932 from jocelynj/devel 
Add option remote_user to task level, to specify the ssh login user
 2013-10-15 06:34:57 -07:00
Michael DeHaan
e131de4de0 Added "debug: var=variableName" capability. 2013-10-14 21:01:38 -04:00
egghead
ca7e2d283c Adding os realpath filter. 
This is particularly useful when wanting to get the absolute path of filepaths found by the 'fileglob' filter.
This also lets you provide absolute paths to roles, which search for files in different areas unless absolutely pathed.
 2013-10-14 23:41:16 +00:00
Michael DeHaan
c90a82fd52 Handle possible scenario where conditional might be an integer (whoa!) down the error path. Super rare but fixes #4483. 2013-10-13 09:19:41 -04:00
Michael DeHaan
9ea54fcaaf Fixes a dev branch glitch where a conditional could be applied to multiple tasks. Also improves the errors on parsing bad conditionals to make them less confusing to users. 2013-10-12 17:39:28 -04:00
Thomas Omans
632232259a Adding config flag role_path for common/global roles 
Using ANSIBLE_ROLE_PATH environment variable or role_path in ansible.cfg
can configure paths where roles will be searched for
extra paths will only be used as a backup once regular locations are exhausted
 2013-10-12 10:15:30 -04:00
Michael DeHaan
43df00550d Merge pull request #3827 from mscherer/disable_callbacks 
add a way for callback to disable itself
 2013-10-12 07:03:06 -07:00
Michael DeHaan
1b2d4c328c Cache patterns a bit higher up to make things a little more efficient. See #4469. 2013-10-11 22:24:37 -04:00
Michael DeHaan
d168c709d5 Fix an issue where the ordering of an include statement is processed ahead of the conditional in the included statement, 
which required a redundant check to see if a variable was defined rather than short circuiting.

Fixes #4469
 2013-10-11 20:43:58 -04:00
Michael DeHaan
add45d2ca9 Fixup legacy var detector. 2013-10-11 19:16:36 -04:00
Michael DeHaan
709ffda3d1 Tweak only_if deprecation detector. 2013-10-11 19:12:25 -04:00
Michael DeHaan
a45494a896 Add warnings feature. 2013-10-11 19:04:26 -04:00
Michael DeHaan
9637f620d7 Deprecation warnings of several flavors, nice and purple and can be disabled 
in ansible.cfg.
 2013-10-11 18:37:39 -04:00
Michael DeHaan
a017a69bb3 Have the parser explain another type of YAML gotcha to reduce the need for users to ask how to resolve it. 2013-10-11 17:34:26 -04:00
Michael DeHaan
861f076df5 Tweak the syntax-detector-warning-suggester-message (SDWSM) a little. 2013-10-11 17:34:26 -04:00
Michael DeHaan
41aaad69aa Make add_host clear the inventory pattern cache, add some more aliases. Fixes #4442. 2013-10-11 16:37:10 -04:00
jctanner
65ef6a62dc Merge pull request #4425 from jeromew/ansible_sudo_user_with_items 
Template sudo_user via with_items
 2013-10-11 10:18:46 -07:00
James Cammarata
d73a5da9e5 Merge pull request #4453 from pschwartz/fix_cfg_load_order_to_match_docs 
GH-4452 Corrected config load order to match docs
 2013-10-11 07:25:05 -07:00
Philip Schwartz
65c8c691f7 GH-4452 Corrected config load order to match docs with 
cwd > ~ > /etc

Signed-off-by: Philip Schwartz <philip.schwartz@rackspace.com>
 2013-10-11 08:33:54 -05:00
Matt Martz
61525a97df Add regex (search, match, regex) jinja2 filters. Fixes #3725 2013-10-11 08:03:04 -05:00
Serge van Ginderachter
c4d20094b4 make changed filter understand results lists 2013-10-10 22:08:38 +02:00
Serge van Ginderachter
e5d45311f9 Implement a |changed filter plugin 2013-10-10 21:34:37 +02:00
Serge van Ginderachter
c2e5f783da Add caching to pattern enumeration 
Inventory._hosts_in_unenumerated_pattern()

Was TODO: cache this logic so if called a second time the result is not
recalculated
 2013-10-10 15:41:48 +02:00
jeromew
dec364ae80 Template sudo_user via with_items 2013-10-10 09:22:26 +00:00
Michael DeHaan
3f968ff46a Check one more skipped scenario in with_subelements. 2013-10-09 17:14:42 -04:00
James Cammarata
9124ebb4f1 Clear out complex_args before running async_status 
When using complex args with an async task, the subsequent runs of
async_status would inherit them, causing a module error (invalid params).

Fixes #3150
 2013-10-09 15:08:47 -05:00
Michael DeHaan
2078518735 Allow subelements to work right with skipped results. 2013-10-09 15:55:47 -04:00
Jeremy Price
9da5043f18 Adding path_prefix to run_command so that one can pass in a path to the run environment if you nees something in a non-default path. 2013-10-09 12:50:29 -04:00
James Cammarata
948d019fef Detect IPv6 addresses in INI inventory 
Prevents parts of the IPv6 address from being interpreted as a port
(for example, :80).

Fixes #3888
 2013-10-09 11:11:09 -05:00
Michael DeHaan
6febc97104 Add a warning about include + with_items so nobody uses it. 2013-10-08 18:12:18 -04:00
James Cammarata
98f6bc1f63 Apply tags to dependent roles correctly 
Fixes #4339
 2013-10-08 15:13:02 -05:00
Michael DeHaan
c69e19c6a6 Enhance references to logging functionality. Fixes #3431. 2013-10-08 08:26:40 -04:00
Michael DeHaan
f081c68a65 Prevent duplicately loaded handlers from running more than once. 
Fixes #3863
 2013-10-07 17:15:19 -04:00
Michael DeHaan
5ed28efe45 Script module should return changed attribute so handlers always fire, unless "changed_when" is specified. 
Fixes #4053
 2013-10-07 17:06:25 -04:00
Michael DeHaan
a7adc8ef4d Allow doing things like "groups.groupname" in with_nested. 
Fixes #3858
 2013-10-07 16:58:29 -04:00
Michael DeHaan
5e30cd999c Make it possible to say: 
tags: 42

And have the tag be a string, not an int, so --tags matches.

Fixes #4110
 2013-10-07 15:19:30 -04:00
Michael DeHaan
8fc46a3a5a Return inventory objects in the order they are presented. Additionally, fix host slicing such that it works on Python terms with 
zero indexed lists and a non-inclusive final element.
 2013-10-07 15:06:15 -04:00
Michael DeHaan
19386c43a7 Merge 2013-10-07 10:02:21 -04:00
James Cammarata
d10582225b Merge branch 'issue_4215_fetch_expanduser' into devel 2013-10-07 08:27:52 -05:00
Andrey Shorin
35457b67f5 Pass host to runner_on_file_diff callback 2013-10-07 08:55:01 -04:00
Stoned Elipot
e7957b6d58 Fix group_by: do not group a host for which a condition is false 2013-10-07 08:44:42 -04:00
Michael DeHaan
44e391fd8b Merge pull request #4255 from mcodd/legacy_vars_fix 
Fix for legacy_playbook_variables (should fix issue #4254)
 2013-10-07 05:44:06 -07:00
Michael DeHaan
65178290e7 Merge branch 'devel' of git://github.com/nextus/ansible into devel 
Conflicts:
	lib/ansible/constants.py
 2013-10-07 08:39:23 -04:00
Michael DeHaan
ea73151757 Add automatic advice when folks hit one of two common but minor YAML gotchas, so they can be more easily correct them on their own. 2013-10-06 10:23:44 -04:00
Michael DeHaan
4987c73bb6 Proper check for raw as module options versus raw being in the string. 2013-10-06 09:54:28 -04:00
James Tanner
52aea868df Allow for updating host vars in add_host 2013-10-04 16:15:17 -04:00
James Cammarata
d21714a37f Fix for network byte order issues in accelerate 2013-10-02 15:37:15 -05:00
James Cammarata
912e3a7b0b Merge branch 'accelerate_improvements' into devel 
Conflicts:
	library/utilities/accelerate
 2013-10-01 21:22:17 -05:00
James Cammarata
fa80a17aa3 Make recv_data less greedy so it doesn't eat other packets 2013-10-01 16:50:32 -05:00
James Cammarata
8923a5b0d9 Drop default config value for accelerate timeout to 30 seconds 2013-10-01 16:10:48 -05:00
James Cammarata
12f6957596 Cleaning up some vvvv log messages in accelerate 2013-10-01 15:34:58 -05:00
James Cammarata
8c17711247 Removing accelerate_timeout as a playbook option 
This will remain in ansible.cfg only.
 2013-10-01 15:33:18 -05:00
James Cammarata
d317103371 Added in an accelerate connection timeout setting 2013-10-01 15:28:59 -05:00
James Cammarata
59a5ce23d9 Adding an accelerate_timeout parameter for plays 
This setting makes the timeout for each play configurable, rather than
hard-coding it at 300 seconds (now the default if left unspecified)

Fixes #4162
 2013-10-01 15:26:50 -05:00
James Cammarata
f9c87868ac Added keepalive packets to accelerate mode 
Commands will now be started up in a separate task from the main
handler thread, so that it can be monitored for completeness while
sending a keepalive packet back to the controller to avoid a socket
receive timeout.
 2013-10-01 15:19:21 -05:00
James Cammarata
8a3f8b757b Make sure yaml data loaded for role is valid before using it 
Fixes #4322
 2013-10-01 10:52:39 -05:00
James Cammarata
bff47df5ff Fix issue with ast evaluation of strings 2013-10-01 09:20:48 -05:00
James Cammarata
5b205ae8bd Merge branch 'fixes/subprocess' of https://github.com/ferringb/ansible into ferringb-fixes/subprocess 2013-09-30 23:30:43 -05:00
James Cammarata
d89ce6ac61 Merge branch 'patch-1' of https://github.com/ustun/ansible into ustun-patch-1 2013-09-30 23:20:44 -05:00
James Cammarata
12a21d94b7 Merge branch 'allow_types_in_ini' of https://github.com/bcoca/ansible into bcoca-allow_types_in_ini 2013-09-30 22:56:07 -05:00
jctanner
32a1dd422c Merge pull request #4269 from jphalip/issue-4256 
In the script action: Get around a Python bug.
 2013-09-30 20:24:49 -07:00
James Cammarata
7aad576f5f Minor change to add a space around role name/task delimiter 2013-09-30 21:51:39 -05:00
James Cammarata
1cc1e7058b Merge branch 'role_report_fix1' of https://github.com/bennojoy/ansible into bennojoy-role_report_fix1 2013-09-30 21:25:11 -05:00
James Cammarata
8ed343cc36 Merge branch 'jsmartin-hide_skipped_hosts' into devel 2013-09-30 21:07:33 -05:00
James Cammarata
6cd8aacc81 Merge branch 'hide_skipped_hosts' of https://github.com/jsmartin/ansible into jsmartin-hide_skipped_hosts 2013-09-30 20:22:53 -05:00
James Cammarata
52a42bf607 Add more verbose debugging options for accelerate 2013-09-30 14:08:07 -05:00
Michael DeHaan
ac0a7d965a Merge pull request #4306 from sivel/3563-glob 
Add fileglob Jinja2 filter. Fixes #3563
 2013-09-30 11:17:31 -07:00
Matt Martz
535ce97067 Add fileglob Jinja2 filter. Fixes #3563 2013-09-30 12:55:13 -05:00
Brian Harring
d0ad6c581b For defaults that are integers, enforce it for config supplied values. 
If a user supplies a string in the config (rather than an int), the code
should fix that- or blow up immediately- rather than allowing that value to
work it's way down and break w/in the connection object; when that happens,
the actual error is opaque and requires pdb.set_trace() to run down.
 2013-09-29 23:56:41 -04:00
Brian Harring
2174230315 USE subprocess.Popen API correctly. 
When collecting stdout/stderr *and* feeding data into a Popen instance,
communicate() must be used to avoid a known deadlocking scenario
when data sizes cross PIPE_BUF (which can be as small as 512, although should
be much larger in practice on linux).
 2013-09-29 23:22:09 -04:00
Ustun Ozgur
977b31249a Update cache check in find_plugin 
I am not familiar with the internals, but this line looked suspicious.
 2013-09-29 14:03:10 +03:00
Julien Phalip
44aeea7afc In the script action: Get around a bug in that's been fixed in Python 2.7 but not Python 2.6. 
See: http://bugs.python.org/issue6988
Fixes #4256.
 2013-09-27 08:57:07 -07:00
James Cammarata
039d4c95d9 Merge pull request #4221 from ashorin/unicode-md5 
Prevent UnicodeEncodeError: 'ascii' codec can't encode characters in pos...
 2013-09-27 08:50:44 -07:00
Brian Coca
771435deb4 now ini vars are typed 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-09-26 18:29:17 -04:00
James Martin
d5f20e6b21 Optionally display Skipping [host] messages. 2013-09-26 10:03:23 -04:00
bennojoy
482cb72128 role report fix 2013-09-26 19:20:14 +05:30
Matt Coddington
7f7116de3b commit 9db4f7a made a change that also needed to include this to retain correct legacy_playbook_variables behavior 2013-09-25 23:22:09 -04:00
Preston Marshall
3ee7b177e8 Allow storing input from user in a pause prompt 2013-09-25 17:28:25 -05:00
James Cammarata
1c97831288 Merge branch 'empty_inventory' of https://github.com/spil-jasper/ansible into spil-jasper-empty_inventory 2013-09-25 15:54:05 -05:00
James Cammarata
994dfb84fc Minor pep8 cleanup and CHANGELOG update for do-until 2013-09-25 15:51:49 -05:00
James Cammarata
202c4f5294 Merge branch 'do_until_14' of https://github.com/bennojoy/ansible into bennojoy-do_until_14 2013-09-25 15:49:14 -05:00
James Cammarata
478c400817 Minor pep8 cleanup in the new jail connection plugin 2013-09-25 14:48:30 -05:00
James Cammarata
0e0595bdb2 Merge branch 'jail' of https://github.com/mscherer/ansible into mscherer-jail 2013-09-25 14:47:24 -05:00
bennojoy
70a9a797fa Fix for accelerate when ansible_ssh_user is specified 2013-09-25 19:24:54 +05:30
Jasper Capel
d4dec5f577 Allow creating empty inventory 
Instantiating the Inventory class with host_list=None now results in an
empty inventory instead of an error.
 2013-09-25 15:00:35 +02:00
nextus
ca96d74572 #4227 in upstream repo 2013-09-25 16:15:49 +04:00
Andrey Shorin
fd101dd2d6 Encode to utf-8 only when needed 2013-09-25 09:29:57 +04:00
Andrey Shorin
21f5bc4242 Prevent UnicodeEncodeError: 'ascii' codec can't encode characters in position ...: ordinal not in range(128) 2013-09-25 09:29:56 +04:00
bennojoy
0e749611ac doc update and add attempts 2013-09-25 09:56:14 +05:30
bennojoy
21529de82e dountil feature commit 2 2013-09-24 15:23:01 +05:30
bennojoy
53e48b63a9 dountil feature commit 1 2013-09-24 13:59:38 +05:30
James Cammarata
2f39d37a97 Expand destination path in the fetch action 
Fixes #4215
 2013-09-23 20:23:48 -05:00
Michael DeHaan
319a0f9523 Merge pull request #4154 from mplonka/AIX_MD5 
using AIX 'csum' command for generating MD5 checksums
 2013-09-23 08:27:12 -07:00
Michael DeHaan
7f8126a6c9 Merge pull request #4168 from nigelm/md5_filter 
Added md5 as a jinja filter - returns hex digest of input
 2013-09-23 08:21:11 -07:00
Andrey Shorin
cb4b964070 Allow for dynamic accelerate_port: and port: in plays 2013-09-23 13:33:36 +04:00
James Cammarata
1f674c4a50 Merge branch 'fix_selinux_debian' of https://github.com/mscherer/ansible into mscherer-fix_selinux_debian 2013-09-21 00:32:40 -05:00
Alek Storm
3569a2ffee Handle AnsibleUndefinedVariable's raised from lookup plugins like jinja2 UndefinedError's 2013-09-20 19:56:12 -05:00
James Cammarata
47b9cc6311 Merge branch 'meta-roles' of https://github.com/eggsby/ansible into eggsby-meta-roles 
Conflicts:
	lib/ansible/playbook/play.py
 2013-09-20 16:17:40 -05:00
James Cammarata
27e8675277 Make the role_name in the task its own field for use in the callback 2013-09-20 15:46:34 -05:00
James Cammarata
98cfcec5e2 Correct role name detection 2013-09-20 12:10:24 -05:00
James Cammarata
8dcf386def Don't set the role name on handlers as this breaks notifications 2013-09-20 09:34:14 -05:00
James Cammarata
a5ee6ff1e5 Display parent role name of tasks in the name line 
Fixes #4076
 2013-09-19 20:44:52 -05:00
James Cammarata
c840cbaad9 Merge branch 'fork_fixes' of https://github.com/akerl/ansible into akerl-fork_fixes 2013-09-19 10:37:45 -05:00
James Cammarata
69cfcf7ed0 Minor change to -vvvv mode to only show debugging info for ssh conns 
Also added this feature to the CHANGELOG
 2013-09-19 08:12:43 -05:00
James Cammarata
d5b96abd80 Added support for -vvvv to enable ssh connection debugging 
This patch also checks specifically for a return code of 255, which
indicates an unknown SSH error of some kind. When that happens, ansible
will now recommend running with -vvvv (if not enabled) or show the
output from 'ssh -vvv' (when it is enabled)
 2013-09-19 05:58:54 -05:00
Nigel Metheringham
f0cc2d6efe Added md5 as a jinja filter - returns hex digest of input 2013-09-19 09:38:22 +01:00
Timothy Appnel
d8cd3d603e Straightened out the logic for delegate handling in synchronize action module 2013-09-19 03:17:44 -04:00
Timothy Appnel
61e726fe82 Fix to local delegate_to override and proper sudo handling from @smoothify 2013-09-19 03:17:44 -04:00
Timothy Appnel
32ae6fdd43 Return of sychronize module code for take 3 2013-09-19 03:17:43 -04:00
Thomas Omans
91a4ba2248 allowing a roles to do be made out of dependencies alone 2013-09-18 21:29:37 -07:00
James Cammarata
503f062521 Merge branch 'ferringb-fixes/configurable-ControlPath' into devel 2013-09-18 21:12:15 -05:00
Michael DeHaan
20708e31b1 Merge pull request #4133 from skyl/DIST_MODULE_PATH 
DEFAULT_MODULE_PATH in setup.py
 2013-09-18 18:15:18 -07:00
Marcin Płonka
d0c78bdc83 using AIX 'csum' command for generating MD5 checksums 2013-09-18 21:07:25 +02:00
Brian Harring
5b1b831cc7 Make ssh's ControlPath configurable via ansible.cfg 
This shouldn't generally be needed unless you're working in an environment
that uses rediculously long FQDNs; if the name is too long, you wind up
hitting unix domain socket filepath limits enforced by ssh.
 2013-09-18 15:07:07 -04:00
Stephen Fromm
27b5c2e28c Fix how module_common handles selevel (issue #4142) 
Two fixes:

* parameter name is selevel, not serange.
* Fix split on selinux context to limit to max of 4 since the selevel
  may contain ':' characters.  This was fixed in
  selinux_default_context() and selinux_context().
 2013-09-17 14:47:00 -07:00
Skylar Saveland
50bd14faa9 use DEFAULT_MODULE_PATH in setup.py so that there is a chance to override with ANSIBLE_LIBRARY env variable 2013-09-16 19:08:22 -07:00
Les Aker
98bf473cb2 fixes for PTY handling 2013-09-16 17:44:32 -04:00
James Cammarata
458f71b53c Merge branch 'issue_4129_role_defaults_empty_yaml' into devel 
Conflicts:
	lib/ansible/playbook/play.py
 2013-09-16 16:21:06 -05:00
James Cammarata
091a90ee8b Allow includes to follow the standard format 
Previously, includes had to receive variables via a special 'vars'
field. With this patch, the include syntax becomes a more natural
datastructure without special fields and is more akin to the way
role includes/dependencies work.

Tested with the following playbook:
---
- hosts: localhost
  connection: local
  tasks:
  - { include: inc1.yml, a: 1 }
  - include: inc2.yml
    b: 2
  - include: inc3.yml
    with_items:
    - x
    - y
    - z

Fixes #3481
 2013-09-16 16:12:36 -05:00
Skylar Saveland
8dc31f3093 ANSIBLE_DIST_MODULE_PATH environment variable 2013-09-16 13:43:20 -07:00
James Cammarata
c5bb1394b9 Check to make sure default_vars in the datastructure isn't empty 
Fixes #4129
 2013-09-16 13:16:06 -05:00
James Cammarata
5b15010099 Merge branch 'issue_3312_role_links' into devel 2013-09-16 09:29:25 -05:00
James Cammarata
3b801dec72 Merge branch 'failed_when' of https://github.com/hnakamur/ansible into hnakamur-failed_when 2013-09-16 07:35:34 -05:00
James Cammarata
fcc18fa105 Merge branch 'subelements' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-subelements 2013-09-16 06:14:42 -05:00
James Cammarata
aac3090909 Merge branch 'play_remote_user' of https://github.com/bcoca/ansible into bcoca-play_remote_user 2013-09-16 05:55:14 -05:00
James Cammarata
3848e02959 Merge branch 'issue4022' of https://github.com/sfromm/ansible into sfromm-issue4022 
Conflicts:
	lib/ansible/runner/connection_plugins/accelerate.py
 2013-09-16 05:50:35 -05:00
James Cammarata
d9cf1dfefb Merge branch 'fetch' of https://github.com/bpennypacker/ansible into bpennypacker-fetch 2013-09-16 05:39:48 -05:00
James Cammarata
f4b3defcbf Set sudo in accelerate commands correctly 
Fixes #4111
 2013-09-15 20:20:22 -05:00
Michael DeHaan
5c0dd958e5 Merge pull request #4028 from willthames/lineinfile_userdir 
Expand tilde in paths in file module
 2013-09-15 09:33:49 -07:00
Michael Scherer
5e1828a524 add jail module, based on lxc and chroot connexion plugin 2013-09-15 17:26:48 +02:00
Michael DeHaan
1f0eb32846 Update 1.4 specfile -- no need for node fireball package, release dates 2013-09-13 17:31:34 -04:00
James Cammarata
35d138a0d6 When checking conditionals, don't dereference when the variable contains dashes 
Fixes #4104
 2013-09-13 13:52:58 -05:00
James Cammarata
d0236f6ada Check for link in path in utils.path_dwim_relative() 
This allows an included path to be relative to a directory, if the
basedir of the original path is a symlink. In that case, the path
is normalized and the file is searched for in the normalized path.

Fixes #3312
 2013-09-12 20:44:10 -05:00
Marcin Kałuża
6786773797 filter out qoutes since they cause random errors 2013-09-10 15:00:29 +02:00
Marcin Kałuża
aab445a28f add 'chars' parameter to password plugin to allow custom character set 
It accepts comma separated list of names that are
either string module attributes (ascii_letters,digits, etc)
or are used literally

To enter comma use two commas ',,' somewhere - preferably at the end
Qoutes and double qoutes are not supported
 2013-09-10 11:59:16 +02:00
Hiroaki Nakamura
2357194b39 Add failed_when module variable. 
Implementation note: Ternery operator trick for python prior to 2.5 is used.
(test and [when_true_value] or [when_false_value])[0]
http://stackoverflow.com/questions/394809/ternary-conditional-operator-in-python#comment1466794_394887
 2013-09-10 08:34:01 +09:00
Serge van Ginderachter
4f9af7efad subelements lookup plugin 2013-09-09 23:45:55 +02:00
James Cammarata
75a9357e5e Fixing role variable precedence for top-level roles 
Fixes #4026
Fixes #3989
 2013-09-09 15:14:03 -05:00
James Cammarata
294451d002 Correctly handle variable issues when evaluating jinja2 when statements 
Fixes #4025
 2013-09-09 14:50:21 -05:00
James Cammarata
bcc2a4b513 Minor fix so the any_errors_fatal value is checked properly 2013-09-09 10:20:41 -05:00
James Cammarata
4025695c00 Merge branch 'devel' of https://github.com/kavink/ansible into kavink-devel 2013-09-09 10:00:29 -05:00
Brian Coca
d47c48e30a Added remote_user to plays 
Still compatible with user: but deprecating it so we can have
a matching remote_user: in tasks, cannot be user: because of the
module of the same name. #3932

Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-09-07 16:34:22 -04:00
Kavin Kankeshwar
c24f6f438b Avoid ugly formatting due to a long if statement 2013-09-06 22:37:17 -07:00
James Cammarata
6e9fa5019f Reverting HostVars change from a mapping back to a dictionary 2013-09-06 20:24:16 -05:00
James Laska
546788a1b6 The required package for selinux is libselinux-python 2013-09-06 16:26:48 -04:00
James Cammarata
4e9dee6093 Use StringIO to feed md5 calculation to prevent unicode issues 
Fixes #4014
 2013-09-06 09:11:47 -05:00
James Cammarata
2a47f72139 Merge pull request #4049 from mscherer/fix_no_kerberos 
Fix no kerberos
 2013-09-06 07:10:10 -07:00
Michael Scherer
f489702973 Also add back gssapi-keyex 
While this is not currently implemented in openssh as far as I know,
there is patch floating around on the web and this may land one day
upstream.
 2013-09-06 10:40:34 +02:00
Keiichi Mori
17c39b94a3 support GSSAPIAuth back 
GSSAPIAuthentication has not been supported
due to PreferredAuthentications trick ( 2bdba17a85 )
 2013-09-06 10:40:25 +02:00
James Cammarata
ae9e38daf8 Change hostvars to a mutable mapping to more closely resemble a dict 
Fixes #4030
 2013-09-05 23:04:16 -05:00
James Cammarata
2cbf28385a Move check for accelerate mode deeper to account for ansible_connection 
Fixes #4045
 2013-09-05 20:20:25 -05:00
James Cammarata
20b0dc4abd Check for an empty executable passed into the accelerate plugin 
This was breaking at least the script module, so it would seem best
to check for it and set it to the default executable value
 2013-09-05 15:11:26 -05:00
James Cammarata
4bf506f683 Always run the accelerate module as the user specified in the play 
Currently, the accelerate daemon will be run as the sudo_user if
specified, which is incorrect.
 2013-09-05 12:04:48 -05:00
Scott Sturdivant
68bffb1233 Don't force accelerate connection for local actions. 2013-09-05 09:37:47 -06:00
James Cammarata
f6e1bdabea Ensure ports are set correctly in accelerate module 2013-09-05 09:52:10 -05:00
willthames
fe70ed94e3 Expand tilde in paths in file module 2013-09-05 16:28:26 +10:00
guersam
64db327411 Fix: raise correct error in accelerate mode 2013-09-05 15:10:45 +09:00
kavink
a075ec9831 Bug fix for a crash, when any_errors_fatal is true 
Reported by Rumen:

TASK: [fail FAIL] *************************************************************
skipping: [hostname.com]
failed: [hostname.com] => {"failed": true}
msg: Failed as requested from task
Traceback (most recent call last):
  File "/usr/local/bin/ansible-playbook", line 268, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/usr/local/bin/ansible-playbook", line 208, in main
    pb.run()
  File "/Library/Python/2.7/site-packages/ansible/playbook/__init__.py", line 262, in run
    if not self._run_play(play):
  File "/Library/Python/2.7/site-packages/ansible/playbook/__init__.py", line 580, in _run_play
    if (hosts_count - len(host_list)) > int((play.max_fail_pct)/100.0 * hosts_count):
TypeError: object of type 'NoneType' has no len()
 2013-09-04 18:30:33 -07:00
Stephen Fromm
d704b55860 Support using paramiko to set up accelerate connection 
Adds original_transport attribute to Runner to track what the original
transport was before it is changed to 'accelerate'.
If using paramiko in original_transport, uses ParamikoConnection.  If
not, falls back to SSHConnection like before.
 2013-09-04 13:57:03 -07:00
James Cammarata
fff497a1ae Make sure the accelerated port is set to a sane value 2013-09-04 15:52:39 -05:00
James Cammarata
cc21e5c90c Adding hostvars to injected variables in accelerate ssh runner 
Also some minor cleanup of some fb* variables and functions, which
were remnants of the old fireball2 name

Fixes #4021
 2013-09-04 15:29:46 -05:00
James Cammarata
7b13b1e03e Minor fix to dependency dupe patch 2013-09-04 11:26:49 -05:00
James Cammarata
16258edd7a Merge branch 'devel-duplicates2' of https://github.com/smoothify/ansible into smoothify-devel-duplicates2 2013-09-04 10:13:06 -05:00
James Cammarata
a202adcae1 Merge branch 'doublecallback' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-doublecallback 2013-09-04 09:58:06 -05:00
smoothify
5337397abd Second Attempt: Ensure duplicate roles are not loaded in the case of a missing meta/main.yml file. 2013-09-04 15:50:39 +01:00
James Cammarata
c0fecf87d1 Increase default socket timeout to 5 minutes 2013-09-04 09:47:40 -05:00
smoothify
0411ea2867 Ensure duplicate roles are not loaded in the case of a missing meta/main.yml file. 2013-09-04 12:38:42 +01:00
James Cammarata
2e49d2003d Fix bug where accelerate keyword was not checked for boolean value 
The play was just checking for the presence of the keyword in the
YAML datastructure, and not the value of the field, so doing something
like variable substitution was always causing the play to be accelerated
 2013-09-03 14:20:56 -05:00
James Cammarata
2696135b3b Display error during launch of accelerated daemon 
* also minor tweak to the # of retries in the connection attempt

Fixes #4012
 2013-09-03 12:28:32 -05:00
James Cammarata
7c1c9b3d10 Fix message in utils related to python-keyczar and fireball/acc mode 2013-09-03 11:16:50 -05:00
James Cammarata
53c2f4c1bb Fix race condition on creating the temp directory for ControlPersist 
Fixes #3943
 2013-09-03 11:00:33 -05:00
James Cammarata
d05c61d1f0 Merge branch 'devel' into fireball2 
Conflicts:
	lib/ansible/playbook/__init__.py
	lib/ansible/playbook/play.py
 2013-09-02 21:54:02 -05:00
James Cammarata
50f54f6bda Making variable names more descriptive for the default variables work 2013-09-02 21:37:50 -05:00
James Cammarata
02b7b79d7e Re-adding capability of tasks to see a unique view of their own defaults 2013-09-02 21:37:50 -05:00
Stoned Elipot
6cbd94dfae Avoid duplicates of the 'all' group when using inventory script. 
Do not recreate an 'all' group when it is in the inventory script's
output, but use the one created upfront.
 2013-09-02 12:26:02 +02:00
James Cammarata
266d2008d8 Reverting the role default variables change 
Loading the default variables in _build_role_dependencies() lead to
a side-effect where those variables were over-riding inventory variables.
 2013-09-01 08:53:59 -05:00
James Cammarata
47a89a57fa Fixing bug in playbook use of default variables in roles 2013-09-01 08:49:41 -05:00
James Cammarata
e0df5b5888 A couple more tweaks to role default variables/dependencies 
* Default variables are now fed directly into roles, just like the
  other variables, so that roles see their unique values rather
  than those set at the global level.

* Role dependency duplicates are now determined by checking the params used
  when specifying them as dependencies rather than just on the name of the
  role. For example, the following would be included twice without having
  to specify "allow_duplicates: true":

  dependencies:
  - { role: foo, x: 1 }
  - { role: foo, x: 2 }
 2013-09-01 00:43:16 -05:00
James Cammarata
d69d5c294f Renaming fireball2 as 'accelerate' and removing old references 2013-08-30 13:26:27 -05:00
James Cammarata
736c8b19d3 Added ability to limit role dependencies to just one inclusion 2013-08-30 12:42:27 -05:00
James Cammarata
6f6efa268b Merge branch 'smoothify-defaults' into devel 2013-08-30 08:40:47 -05:00
James Cammarata
25e3eed519 Fixing a bug in variable precedence for roles and dependencies 2013-08-30 01:20:45 -05:00
James Cammarata
637d3070dc Allow default variables to be overridden by inventory variables 2013-08-29 17:21:28 -05:00
James Cammarata
9806f89a04 Revert "Construct the multiprocessing manager only once." 
This reverts commit 1d13ec2da3.
 2013-08-29 11:00:25 -05:00
James Cammarata
7d3ae9fc75 Fixing a few bugs related to fireball2 
* ssh port not being picked up, always uses default of 22
* forgot to 'import time' in the fireball2 connection plugin
 2013-08-28 19:27:18 -05:00
James Cammarata
f66683863e Merge branch 'defaults' of https://github.com/smoothify/ansible into smoothify-defaults 2013-08-28 16:24:37 -05:00
James Cammarata
faf82bf841 Fix bug with fetch when using sudo: true 
Fixes #3111
 2013-08-28 13:24:16 -05:00
James Cammarata
af1dd7075f Adding chunked file transfers to fireball2 2013-08-28 11:14:58 -05:00
James Cammarata
959138d00d Added accelerate_port to plays, and made it configurable 2013-08-28 11:14:58 -05:00
James Cammarata
167f185092 Initial support for running gather_facts through fireball2 2013-08-28 11:14:58 -05:00
James Cammarata
b45342923c Initial support for sudoable commands over fireball2 
Caveats:
* requiretty must be disabled in the sudoers config
* asking for a password doesn't work yet, so any sudoers users must
  be configured with NOPASSWD
* if not starting the daemon as root, the user running the daemon
  must have sudoers entries to allow them to run the command as the
  target sudo_user
 2013-08-28 11:14:58 -05:00
James Cammarata
4b552457e7 Bail out correctly if socket.recv gets nothing (indicating a closed socket) 2013-08-28 11:14:58 -05:00
James Cammarata
86f01965cd Fireball2 module will now launch in a proper tmp path 2013-08-28 11:14:58 -05:00
James Cammarata
521e14a3ad Fireball2 mode working! 2013-08-28 11:14:58 -05:00
James Cammarata
acc5d09351 Initial commit for the "fireball2" connection plugin 
Still needs:
* chunked file transfer/receive
* should probably move all send/recv operations to separate
  functions to reduce code duplication
* initial connection setup over ssh? or do we handle that in runner?
 2013-08-28 11:14:58 -05:00
James Cammarata
fd2aabaa27 Initial work for the AES cipher class 
This is based somewhat loosely on how Keyczar does things. Their
implementation does things in a much more generic way to allow for more
variance in how the cipher is created, but since we're only using one
key type most of our values are hard-coded. They also add a header to
their messages, which I am not doing (don't see the need for it
currently).
 2013-08-28 11:14:58 -05:00
Bruce Pennypacker
cf6a76c814 changed ignore_md5_mismatch to validate_md5 2013-08-28 14:41:00 +00:00
Bruce Pennypacker
41c474d129 added optional ignore_md5_mismatch parameter 2013-08-28 14:16:57 +00:00
Michael DeHaan
cce7f485b8 Merge pull request #3946 from wincent/spelling-fix 
Fix minor typo in playbook error message
 2013-08-25 17:23:30 -07:00
Wincent Colaiuta
fc4307a9c4 Fix minor typo in playbook error message 2013-08-25 11:29:07 -07:00
James Cammarata
88966e6558 Use AnsibleError instead of exit for errors in utils 2013-08-25 11:46:45 -05:00
Jocelyn Jaubert
4cee6a5435 Add option remote_user to task level, to specify the ssh login user 2013-08-23 23:20:13 +02:00
James Cammarata
8262f7bfac Merge branch 'with_items_and_complex_args' of https://github.com/lberruti/ansible into lberruti-with_items_and_complex_args 2013-08-22 23:01:11 -05:00
James Cammarata
e11bb0cad4 Merge branch 'plugins-work' of https://github.com/ferringb/ansible into ferringb-plugins-work 2013-08-22 14:23:25 -05:00
James Cammarata
462cd4f728 Merge branch 'pulls/fix-hostvars-inconsistancy' of https://github.com/ferringb/ansible into ferringb-pulls/fix-hostvars-inconsistancy 2013-08-22 13:56:34 -05:00
James Cammarata
e6ad3b7792 Merge pull request #3895 from mscherer/fix_option_new_ssh 
make sure ssh do not ask password
 2013-08-22 10:26:54 -07:00
James Cammarata
157b697a83 Merge branch 'always_run-6' of https://github.com/stoned/ansible into stoned-always_run-6 2013-08-22 12:10:28 -05:00
James Cammarata
af4f0bd008 Fix for "argument must be an int, or have a fileno() method" error 
The issue was that, when forks == 1, the _executor() function was
being called with None for the value of new_stdin.

Fixes #3841, #3902
 2013-08-21 22:45:34 -05:00
James Cammarata
978af89175 Disallow running async tasks with lookup plugins 
Fixes #2897
 2013-08-21 16:44:10 -05:00
James Cammarata
ed3e4aff84 Place retry file in the user's home dir instead of /var/lib/tmp 
Addresses CVE-2013-4260: predictable filename used for failed results
in world writable directory.
 2013-08-21 11:40:46 -05:00
James Cammarata
6bf5d19506 SSH connection plugin creates ControlPersist socket files in a secure directory 
Files were being created in /tmp, but will now be created in $HOME/.ansible/cp/
Addresses CVE-2013-4259: ansible uses a socket with predictable filename in /tmp
 2013-08-21 11:40:46 -05:00
Stoned Elipot
f0743fc32a Introduce the 'always_run' task clause. 
The 'always_run' task clause allows one to execute a task even in
check mode.

While here implement Runner.noop_on_check() to check if a runner
really should execute its task, with respect to check mode option
and 'always_run' clause.

Also add the optional 'jinja2' argument to check_conditional() :
it allows to give this function a jinja2 expression without exposing
the 'jinja2_compare' implementation mechanism.
 2013-08-20 23:09:44 +02:00
Michael Scherer
2bdba17a85 make sure ssh do not ask password 
For some reason, ssh seems to ask for password even when
PasswordAuthentication is set to no, adding PreferredAuthentications
with the 2 options removed do the trick.
 2013-08-20 22:02:37 +02:00
Kavin Kankeshwar
7ac3bbc198 resolved #3609 Change max_fail_pct to max_fail_percentage as recommended 2013-08-20 13:55:34 -05:00
Kavin Kankeshwar
3f247fcbe3 fixes ansible/ansible#3609 Add max_fail_pct to playbook parameter, to complement serial option, So if total number of failures execeed max_fail_pct * total number of hosts, do not go to the next serial batch 2013-08-20 13:55:22 -05:00
smoothify
494043947d Add support for role defaults. These are variables on a per role basis with lowest precedence. 2013-08-20 10:11:39 +01:00
Petr Svoboda
e3adfbf5f8 Add tests for undefined variable detection 
Tests `test_playbook_undefined_varsX_fail` check if ansible detects
undefined variables when `error_on_undefined_vars` is enabled. These
tests fail without "Improve behavior with error_on_undefined_vars
enabled" patch.

Tests `test_playbook_undefined_varsX_ignore` check if ansible ignores
undefined variables when `error_on_undefined_vars` is disabled.

Also modify PlayBook._run_task_internal() so error_on_undefined_vars is
testable.
 2013-08-20 00:40:49 -05:00
Petr Svoboda
fff4f1da33 Improve behavior with error_on_undefined_vars enabled 
Pass fail_on_undefined flag to recursive calls to `template` function,
so more undefined variables are detected.

Works only for Jinja style variables. Undefined legacy variables are
never detected.
 2013-08-20 00:40:49 -05:00
Brian Harring
31061213fa Fix inconsistency in hostvars access. 
Previously, hostvars would only expose a keys() list of hosts that had
been seen yet- however you could explicitly access the host if you knew
the name, and get the content that way.  This precludes template code
from being able to safely access information about other hosts if any
limiters/tags were in use.

Additionally, the object was inconsistent for hostvars['myhost'] access
and [x[1] for x in hostvars.items() if x[0] == 'myhost'] access; this is
due to the original derivation from the dict object.  .items() would be
handled by dict.items(), using the passed in setup_cache values without
using the actual lookup content.

This patch rebases the class implementation to a py2.6 dictmixin, fixing
those issues and restoring behaviour to match what the docs claim.
 2013-08-19 23:57:08 -04:00
Brian Harring
902183ac0e Enforce alphanumeric ordering for plugins grabbed via glob. 
If this isn't done, it's left to directory ordering which can result
in indeterminent behaviour.
 2013-08-19 19:48:17 -04:00
James Cammarata
39628d012d Minor fix to ipv6 detection for inventory with -i 
For link-local addresses, it is sometimes necessary to append the
interface to use for the ipv6 address. This patch extends the ipv6
regex to allow for '%ifnameX' at the end.

See https://bugzilla.redhat.com/show_bug.cgi?id=136852 for more info
 2013-08-19 15:27:21 -05:00
Michael Scherer
3aac187387 fix ssh connection plugin to work with ipv6 address 
Due to various inconsistencies of ssh and sftp regarding ipv6 and
ipv4 handling, some special arguments must be passed, and the
ipv6 must be passed in a specific format.
 2013-08-19 15:27:20 -05:00
Michael Scherer
c9d28e10ad add support for using a ipv6 in -i 
testing with a ipv6 :
  ansible -u misc -i  '[2002::c23e]:22,' '*' -m ping

fail due to parsing of ':' as a separator of port/ip with ipv4.
This commit add support for properly parsing 2002::c23 and the
bracket notation [2002::ce]:2222
 2013-08-19 15:27:20 -05:00
Matt Saunders
9fd1b174f5 Fixed tiny bug with _meta handling in external inventory scripts 2013-08-19 18:54:30 +01:00
James Cammarata
5847720746 Fixing a small bug with the new role dependency feature 
The block that added the original list of roles was indented too far,
and was only being reached if a role had dependencies. This resulted
in roles without dependencies from being added to the list of roles.

Credit goes to looped for reporting and diagnosing the issue.
 2013-08-17 00:06:24 -05:00
Michael DeHaan
42648e2f0a Merge branch 'role_dependencies' of git://github.com/jimi1283/ansible into jimi1283-role_dependencies 2013-08-16 21:42:57 -04:00
Michael DeHaan
dacd311474 Removing synchronize momentarily as it looks like this won't make 1.3 dates 2013-08-16 15:22:39 -04:00
James Cammarata
d8a7a2d1b2 Adding evaluation of role vars as the dep tree is built 
This allows variables to be inserted into the role scope specifically
while also being inserted into the global scope.
 2013-08-15 20:53:23 -05:00
James Cammarata
e12b99dba6 Small cleanup, no need to call _get_role_path a second time 2013-08-15 09:29:51 -05:00
James Cammarata
9a401e73a6 Adding support for role dependencies. 
Fixes #3686

Dependencies are enabled by adding a new directory/file named
meta/main.yml to the role. The format of the dependencies are:

dependencies:
- { role: foo, x: 1, y: 2 }
- { role: bar, x: 3, y: 4 }
...

Dependencies inherit variables as they are seen at the time of the
dependency inclusion. For example, if foo(x=1, y=2) has a dependency
on bar(x=3,z=4), then bar will have variables (x=3,y=2,z=4).

Different roles can have dependencies on the same role, and this
variable inheritence allows for the reuse of generic roles quite easily.
For example:

Role 'car' has the following dependencies:
dependencies:
  - { role: wheel, n: 1 }
  - { role: wheel, n: 2 }
  - { role: wheel, n: 3 }
  - { role: wheel, n: 4 }

Role 'wheel' has the following dependencies:
dependencies:
- { role: tire }
- { role: brake }

The role 'car' is then used as follows:
- { role: car, type: honda }

And tasks/main.yml in each role simply contains the following:
- name: {{ type }} whatever {{ n }}
  command: echo ''

TASK: [honda tire 1]
TASK: [honda brake 1]
TASK: [honda wheel 1]
TASK: [honda tire 2]
TASK: [honda brake 2]
TASK: [honda wheel 2]
TASK: [honda tire 3]
TASK: [honda brake 3]
TASK: [honda wheel 3]
TASK: [honda tire 4]
TASK: [honda brake 4]
TASK: [honda wheel 4]
TASK: [I'm a honda]  <- (this is in roles/car/tasks/main.yml)
 2013-08-15 09:29:51 -05:00
James Cammarata
ad595eadea Enable error_on_undefined_vars by default 2013-08-15 09:28:34 -05:00
Michael Scherer
12bf9a8b69 add a way for callback to disable itself 
The idea is that some plugin would not be called in some
specific case, and the callback should decide by itself.

Having a way to globally disable it is much cleaner than
disabling every method one by one on the plugin side.

My use case is for fedora-infrastructure that cannot be run
from git checkout since it try to connect to the message bus,
but another case would be to bootstrap infrastructure, or to
run the code on a test servers without having all the callback
infrastructure setup.
 2013-08-14 22:32:28 +02:00
Luca Berruti
eee278e02b fix 2013-08-14 13:26:14 +02:00
Luca Berruti
5048218ab5 Fix: with_items and complex_args 2013-08-14 11:49:46 +02:00
Serge van Ginderachter
173586b871 Ensure plugin_loader.all() only loads one instance 
by ensuring all basedirs, plugin paths and extra
paths are handled as absolute paths and are checked
to not add any doubles.

This fixes the corner case where e.g. the user has
an additional plugin path configured to a dir
relative to his playbooks or inventory location,
which also matches the  _plugin subdir relative to
one of the basedirs in the play.

For most plugins this doesn't show as an obvious issue
except for callback_plugins, which might fire more
than once. Other plugins (inventory and template
plugins) might unnecessarily be ran twice.

e.g. ansible.cfg has
callback_plugins   = ./plays/callback_plugins
and plays/ contains a playbook file:
.
├── ansible.cfg
├── inventory
└── plays
    ├── callback_plugins
    │   └── timestamp.py
    └── site.yml

modified:   lib/ansible/utils/plugins.py
 2013-08-12 22:17:53 +02:00
Michael DeHaan
bc02e20503 Merge branch 'rsynctake2' into devel 
Conflicts:
	CHANGELOG.md
 2013-08-11 16:22:36 -04:00
Michael DeHaan
17aa0d12de Merge pull request #3814 from ftao/inventory_dir_abs 
fix inventory.basedir is not absolute path when hostfile is startswith "./"
 2013-08-11 08:46:08 -07:00
Abhijit Menon-Sen
1a90d01ba9 Fix some typos discovered during casual reading 2013-08-11 18:41:23 +05:30
ftao
51a180b150 fix inventory.basedir is not absolute path when hostfile is startswith "./" 2013-08-11 10:50:47 +08:00
Michael DeHaan
f8c97d6e79 Style/docs cleanup, and also improve an error message. 2013-08-10 18:58:45 -04:00
Michael DeHaan
aeb8649da5 Merge branch 'ansible-rsync-take2' of git://github.com/tima/ansible into rsynctake2 2013-08-10 18:31:45 -04:00
Michael DeHaan
4d1f447908 Merge pull request #3650 from bcoca/forking_optimizations 
forking least possible
 2013-08-10 15:29:19 -07:00
Michael DeHaan
baffa8df72 These fields are booleans. 2013-08-10 18:16:01 -04:00
Michael DeHaan
633abca916 Merge branch 'nocolor' of git://github.com/amenonsen/ansible into devel 2013-08-10 18:11:27 -04:00
Michael DeHaan
ee11d69697 Merge branch 'better_ini_errors2' of git://github.com/bcoca/ansible into devel 2013-08-10 18:01:17 -04:00
Michael Vogt
89bc43cab0 support i18n on sudo failure 2013-08-10 17:56:39 -04:00
Serge van Ginderachter
9991a530ab fix an encoding bug in copy content = lookup plugin 
closes #3518
 2013-08-10 17:37:04 -04:00
Michael DeHaan
66b29b6813 Merge branch 'feature/gh-3789-inventory-file' of https://github.com/resmo/ansible into devel 2013-08-10 17:11:48 -04:00
Michael DeHaan
1d13ec2da3 Construct the multiprocessing manager only once. 2013-08-10 09:32:46 -04:00
René Moser
e8272e365d
implemented 'inventory_file' variable. Closes GH-3789. 2013-08-10 13:04:56 +02:00
Timothy Appnel
2288a11b6a Implemented setup method in rsync action module. 2013-08-09 21:24:50 -04:00
Timothy Appnel
4a9635e04e Straighten out local-remote-delegate logic in rsync action module. Force set delegate to local if one is not defined. 2013-08-09 21:24:49 -04:00
Timothy Appnel
adbca9d251 Fixed identity key logic. 2013-08-09 21:24:47 -04:00
Timothy Appnel
9f170f579a Introduced ansible-rsync to core. 2013-08-09 21:24:46 -04:00
James Cammarata
ceff3b6ba3 Minor modification to set_fact with_items patch 
Previous patch was reverted due to the fact that there was an issue
with the results not always being a dictionary (they're sometimes
a unicode string, ie. when the with_items is used with yum). This
minor change corrects that by checking for a dict object.
 2013-08-09 07:52:14 -05:00
James Cammarata
8be2fc745b Revert "Check for ansible_facts in results for with_ tasks" 
This reverts commit 1a4e6e415e.
 2013-08-08 20:32:30 -05:00
Serge van Ginderachter
1a4e6e415e Check for ansible_facts in results for with_ tasks 
that loop over a lookup plugin. Fixes #3704 and #3735
 2013-08-08 12:30:32 -05:00
Serge van Ginderachter
40e60c947d Host specifiers should be sorted 
to ensure consistent behavior, hosts should look like this:

    hosts: webservers:&boston:!rack42

So when applying the host selectors, run those without the "&" first,
then the &s, then the !s.

Closes #3500
 2013-08-08 18:32:24 +02:00
Abhijit Menon-Sen
0c96d8af6e Add a nocolor setting to ansible.cfg 2013-08-08 21:37:33 +05:30
Brian Coca
a937a6a66d now bad ini entries will throw friendlier error 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-08-07 12:49:12 -04:00
Michael DeHaan
4cbfe3be57 Merge pull request #3773 from cchurch/devel 
Update callbacks used for async tasks
 2013-08-06 13:32:53 -07:00
Michael DeHaan
ff44c981e9 Merge pull request #3770 from rishid/devel 
Add support for INI comments that begin with '#' or ';'
 2013-08-06 13:29:39 -07:00
Michael DeHaan
99775176ff Merge pull request #3623 from ralph-tice/fix_3567_2 
changed role path template to read all vars instead of just extra_vars
 2013-08-06 13:26:59 -07:00
Chris Church
6ba4331161 Correctly check for failed status from an async task. Use runner_on_async_failed callback (instead of runner_on_failed) when an async task times out. Add runner_on_async_ok callback when a task is started in fire and forget mode. 2013-08-06 12:42:44 -04:00
rishid
d18c90ed8f Add support for INI comments that begin with '#' or ';' 
Ini file format does not have a standard but ';' is used more often than '#' for comments
 2013-08-06 11:41:07 -04:00
Michael Scherer
3fb2da6359 use lgetfilecon_raw instead of lgetfilecon to not depend on local level translation 
If SELinux is enabled and mcstrans is running, daemons are restarted on each
run. After further debugging, it turn out that ansible compare the untranslated
level 's0' with the translated level 'SystemLow' due to mcstrans being running,
which trigger a handler since this is considered as a change.
 2013-08-05 23:54:08 +02:00
Michael DeHaan
56a00e0667 Remove dead code. 2013-08-05 16:13:50 -04:00
Michael DeHaan
8955ac1eda If the result of a dynamic inventory script contains a "_meta" hash at top level 
and the _meta hash contains a "hostvars", don't call --host hostname for any elements
and just serve them directly for performance enhancements with the external inventory
script and a large number of hosts.
 2013-08-04 11:34:42 -04:00
Michael DeHaan
1c6b81233c Merge pull request #3692 from tima/action-init 
Added support of an optional init method for action modules like rsync that need to alter the connection and other inject data before it's established.
 2013-08-03 12:00:04 -07:00
Michael DeHaan
dec43f7a2b PEP8 indent fix. 2013-08-03 14:54:37 -04:00
Michael DeHaan
3dbe65def2 PEP8 indent fix 2013-08-03 14:54:24 -04:00
Michael DeHaan
76fd769704 Merge pull request #3685 from mspaulding06/indexed_items 
Indexed items lookup plugin
 2013-08-03 11:36:51 -07:00
Michael DeHaan
c0ab417ef9 Don't iterate across strings in with_nested. 2013-08-03 14:22:18 -04:00
James Cammarata
82c806979b Only use LOG_LOCK in log_flock if a runner is not specified 
Fixes issue #3466 - When ansible can't authenticate against a host,
and your answer is no, ansible crash.
 2013-08-03 13:28:19 -04:00
James Cammarata
ba38d6bc16 Adding support for hashed known_hosts entries 
Fixes Issue #3716 - SSH known host checking needs to understand
hashed known hosts
 2013-08-02 11:08:02 -05:00
Brian Coca
581a0c9f59 now correctly 'types' value pairs that are passed as options to jinja 
override
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-08-01 21:08:23 -04:00
Michael DeHaan
0335d05f43 Check against None around playbook basedir 2013-08-01 20:44:19 -04:00
Michael DeHaan
bdef7f1774 Merge pull request #3711 from ashorin/devel 
Allow --diff on UTF-8 encoded files and templates
 2013-08-01 17:16:32 -07:00
Michael DeHaan
44d060628e Merge pull request #3706 from lorin/sudo_user_breakage 
Fix sudo_user copy error
 2013-08-01 17:15:26 -07:00