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

1854 commits

Author SHA1 Message Date
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
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
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 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
Michael DeHaan
daf5ecc7c9 Merge pull request #3684 from stoned/fix-3668 
Add extra module path early during playbook parsing.
 2013-08-01 17:14:35 -07:00
Michael DeHaan
83481b32cc Merge pull request #3657 from zqad/devel 
Fix playbook-local host_vars when running from .
 2013-08-01 17:13:04 -07:00
Michael DeHaan
3ebbb56479 Merge pull request #3654 from MaxIV-KitsControls/devel 
Fix nested loop for more than 3 elements
 2013-08-01 17:11:26 -07:00
Michael DeHaan
7813290969 Merge pull request #3645 from stoned/stringify-conditional-2 
stringify conditional before handing it to Jinja2 for evaluation.
 2013-08-01 17:08:34 -07:00
Andrey Shorin
664215eb02 Allow --diff on UTF-8 encoded files and templates 2013-07-31 15:58:32 +04:00
Lorin Hochstein
a303fca193 Fix sudo_user copy regression 
Treat errno 13 (permission denied) as one of the special cases in
atomic_move.

This type of error can occur because of sudo'ing to non-root user.

Fixes #3705
 2013-07-30 16:14:29 -04:00
Timothy Appnel
11beb38c66 Added support of an optional setup method for action modules like rsync that need to alter the connection and other inject data before it's established. 2013-07-29 19:10:43 -04:00
Matt Spaulding
5d15515bbf Add indexed_items lookup plugin 2013-07-28 13:54:17 -07:00
Stoned Elipot
841093921b Add extra module path early during playbook parsing. 
This should fix issue #3668

Also prevent an extra module path to be added multiple times.
 2013-07-28 18:47:26 +02:00
Jonas Eriksson
16efb45735 Fix playbook-local host_vars when running from . 
Since ansible 1.2, it became possible to place a host_vars
directory in the same directory as a playbook, making it possible
to keep host_vars local to that playbook there. However, due to
python's os.path.dirname, a action such as:

 $ ansible-playbook pb.yml

..would not pick up the host_vars as os.path.dirname("pb.yml")
returns "", unlike the unix command dirname that would return
".". Substituting "pb.yml" on the command line with "./pb.yml"
would do the trick, but is not always intuitive. This patch
solves the problem until python solves issue18547 [1].

[1] http://bugs.python.org/issue18547
 2013-07-24 18:33:06 +02:00
Vincent Hardion
09ef7751e1 Fix nested loop for more than 3 elements 
- combine flatten list for each nested level instead once at the end
 2013-07-24 14:19:13 +02:00
Brian Coca
576962d335 now if you set fork to 0 or a number higher than the number of hosts, it 
will be readjusted to the number of hosts runner is going to deal with.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-07-23 20:44:06 -04:00
Stoned Elipot
a1503c4d59 stringify conditional before handing it to Jinja2 for evaluation. 
This should fix simple conditionals like:

    when: ansible_selinux

While here add tests for ansible.utils.check_conditional() in
"jinja2_compare mode".
 2013-07-23 22:24:53 +02:00
WAKAYAMA Shirou
0ce99e391f fix: if a path is symlink and trying to chmod, OSError Exception will be raised. 2013-07-23 22:14:48 +09:00
Michael DeHaan
f0eafff1b4 Merge pull request #3621 from sergevanginderachter/rename2flattened 
also rename plugin name in error message
 2013-07-22 10:32:38 -07:00
Ralph Tice
2383a8205c changed role path template to read all vars instead of just extra_vars 2013-07-22 09:59:26 -05:00
Serge van Ginderachter
b40295910d also rename plugin name in error message 2013-07-22 16:47:36 +02:00
Michael DeHaan
2fe25f19dc Fix to group_by module as a result of previous conditional upgrades. 2013-07-22 10:11:19 -04:00
Michael DeHaan
e3f213e030 Fixup error reporting. 2013-07-22 08:35:31 -04:00
Michael DeHaan
c07dd07767 Add raw copy support (raw=yes), tweak tempfile error message string. 2013-07-22 08:25:55 -04:00
Michael DeHaan
0cf5e5cec3 Merge branch 'devel' of git://github.com/bradleyy/ansible into together 2013-07-21 11:47:05 -04:00
Michael DeHaan
0756aa406a Change conditional operation workflow. 
Conflicts:

	lib/ansible/utils/__init__.py
 2013-07-21 10:37:02 -04:00
Michael DeHaan
7f462a346a Work in progress on merging changed_when. 2013-07-21 10:34:47 -04:00
Michael DeHaan
88720516a1 Merge branch 'changed_when' of git://github.com/stoned/ansible into changed_when 2013-07-21 10:14:03 -04:00
Michael DeHaan
f592340f7f Merge branch 'playbook-skip-tags' of git://github.com/dekked/ansible into skip_tags 2013-07-21 09:43:23 -04:00
Michael DeHaan
3baa55a314 Merge branch 'devel' of git://github.com/sjmudd/ansible into sjmudd_ranges 2013-07-21 09:31:46 -04:00
Michael DeHaan
62b39d3de5 Fix for saving conditionals in variable expressions. 2013-07-21 08:52:00 -04:00
Michael DeHaan
bf70dfc1a0 When a role/include has a conditional, add that conditional ahead of any on the task, not behind, so it can short circuit. 2013-07-20 18:34:24 -04:00
Michael DeHaan
419661542b Added some pipes.quote ops to make sure paths with spaces in them are ok. 2013-07-20 18:28:11 -04:00
Michael DeHaan
192d9f8b89 Merge pull request #3607 from stoned/use-AnsibleFilterError 
Use AnsibleFilterError exception
 2013-07-20 14:58:48 -07:00
Stoned Elipot
667ad2480e Use AnsibleFilterError exception 2013-07-20 23:39:25 +02:00
Stoned Elipot
e7a733a6be Quote pathnames of roles' tasks and handlers files so that _load_tasks() can tokenize them properly 
With the help of AlejandroTrev's eagle eyes. Thanks !
 2013-07-20 23:25:46 +02:00
Michael DeHaan
0f26439234 Remove variable per pyflakes 2013-07-20 12:52:17 -04:00
Michael DeHaan
e1167d6977 tweak indentation for 'make pep8' 2013-07-20 12:48:11 -04:00
Michael DeHaan
0f4229f6c4 Merge pull request #3462 from stoned/filtererror 
Introduce exception AnsibleFilterError and use it in Jinja filters.  Ign...
 2013-07-20 09:12:26 -07:00
Brian Coca
dafbcf87d3 changed atomic_move to be more 'optimistic' which helps deal with corner 
cases and avoid usless work.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-07-20 12:07:00 -04:00
Michael DeHaan
c10c2cae4e Merge branch 'ansible_sudo_at_role_level' of git://github.com/jeromew/ansible into sudo_role 2013-07-20 11:05:38 -04:00
Michael DeHaan
f7dec4f8f4 Rename plugin. 2013-07-20 11:02:16 -04:00
Michael DeHaan
9dec701728 Merge pull request #3559 from sergevanginderachter/flat_list 
Introduce flat_list lookup plugin
 2013-07-20 07:59:44 -07:00
Michael DeHaan
7d2585caf7 Merge pull request #3577 from Tinche/extra-vars-in-playbook-includes 
Enabled the use of extra vars in playbook file paths when including play...
 2013-07-20 07:37:35 -07:00
Brian Coca
c8d6e5be0b missing self in self method usages 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-07-19 14:46:35 -04:00
Michael Vogt
9caef884e1 fail early on the wrong sudo password instead of waiting until the timeout happens 2013-07-19 10:23:00 -04:00
Michael DeHaan
c98b20b2cf Slight style preferences. 2013-07-19 09:22:17 -04:00
Sharif Olorin
5fcbfa984d More informative error message on failure to resolve tmpdir 2013-07-19 09:19:40 -04:00