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

425 commits

Author SHA1 Message Date
Michael DeHaan
1864a480ba Do not read user's SSH config file because only reading it partially is confusing to everyone :) 2012-05-09 23:45:37 -04:00
Michael DeHaan
454e74620b Allow hosts not in inventory to override inventory with -i "host1,host2:port" etc, which is the original intent 
of --override-hosts.
 2012-05-09 23:26:45 -04:00
Michael DeHaan
81b9240979 Merge pull request #363 from jhoekx/template-only-if 
Fix correct variable expansion in includes only_if.
 2012-05-11 15:55:09 -07:00
Jeroen Hoekx
b1da61ae92 Fix correct variable expansion in includes only_if. 
There's not need to run the complete include through the templating engine.
Several variables were not included before the conditional was evaluated.
 2012-05-11 15:55:33 +02:00
Michael DeHaan
4e65b537da Merge pull request #356 from jkleint/singleton-notify 
Support single handlers for notify.
 2012-05-10 17:04:54 -07:00
John Kleint
03b887a53d Support single handlers for notify. 2012-05-10 15:37:30 -04:00
John Kleint
38a03aef6b Fix YAML hosts list. 2012-05-10 15:13:32 -04:00
Jeroen Hoekx
b8573ab7d1 Support list indexing in varReplace. 2012-05-10 19:25:28 +02:00
Michael DeHaan
b90c2356c3 Merge pull request #349 from jhoekx/template-unicode-fixes 
Fixup unicode varReplace templating.
 2012-05-10 05:05:50 -07:00
cocoy
f8244f3168 Fix for bug #264 2012-05-10 18:53:24 +08:00
Jeroen Hoekx
c362a2e581 Fixup unicode varReplace templating. 
The original patches should have conflicted?
53bde0bf51 vs efde61e537
 2012-05-10 10:11:14 +02:00
Stephen Fromm
5e5b4a90dc Fix for sudo to another non-root user (issue #353) 
mktemp creates the temp directory 700 only.  If the sudo-user is not
root, the other user will not be able to run the command (Permission
denied error).  This adds the executable bit for all on the temp
directory.
 2012-05-11 11:48:31 -07:00
Michael DeHaan
abb391f3fd Merge pull request #362 from jhoekx/uppercase-vars 
Allow camelCase variables in varReplace.
 2012-05-11 10:06:21 -07:00
John Kleint
0956aa96f4 Don't read from Paramiko's stderr since there isn't one. 2012-05-11 10:53:35 -04:00
Jeroen Hoekx
0b5b44858e Allow camelCase variables in varreplace. 2012-05-11 14:14:53 +02:00
Michael DeHaan
6119988934 override-hosts is gone since we can't load inventory for hosts (so it's not an whitelist), but we can 
still support hosts outside of inventory if you pass in an array of hosts.  Ports are supported,
but not much other info.
 2012-05-09 21:53:09 -04:00
Michael DeHaan
7f6add670e Merge pull request #346 from jhoekx/improve-varreplace 
Support nested variables in varReplace
 2012-05-09 17:25:07 -07:00
Jeroen Hoekx
a7599954a3 Make no_engine the default templating action. 2012-05-09 16:15:43 +02:00
Jeroen Hoekx
53bde0bf51 Support nested variables in varReplace. 2012-05-09 16:15:43 +02:00
Jeroen Hoekx
55fbc95243 Preserve trailing newline after templating. 
Jinja seems to eat trailing whitespace. A lot of tools complain about this: iptables-restore, iscsid...
 2012-05-09 10:31:32 +02:00
Matthew Williams
a07f69cd54 Template dest and src parameters 2012-05-08 07:12:30 -07:00
Michael DeHaan
9b587d4458 Merge pull request #339 from mgwilliams/feature-unicode 
Allow unicode (utf8) in templates
 2012-05-09 17:16:59 -07:00
Matthew Williams
b89d8db7ce removed debug code 2012-05-08 16:05:43 -07:00
Matthew Williams
efde61e537 allow unicode (utf8) characters in jinja templates 2012-05-08 16:03:51 -07:00
Michael DeHaan
dd5f535925 Be able to use --extra-vars to set the hosts variable 2012-05-07 23:37:09 -04:00
Michael DeHaan
0abca68998 Since host variables are becoming important, it did not make sense to sustain --override-hosts, with the ability 
to create hosts that didn't have inventory information, but also existed, in various groups.
 2012-05-07 23:16:20 -04:00
Michael DeHaan
b2485850bf Revert "fix indentation" 
This reverts commit 42b55a07cd.
 2012-05-07 21:46:45 -04:00
Michael DeHaan
893bf90627 Revert "fix the get_hosts() error in get_groups returning a dict not a list of group objects" 
This reverts commit f41fb90d78.
 2012-05-07 21:46:36 -04:00
Michael DeHaan
a54d9f66e6 Merge pull request #329 from skvidal/devel 
inventory and indentation
 2012-05-08 03:54:41 -07:00
Jeroen Hoekx
1d28212f86 Inventory: undefined group -> ungrouped. 
Also change test name collision.
 2012-05-08 09:44:59 +02:00
Jeroen Hoekx
3b40158961 Inventory: support list of vars in host. 2012-05-08 09:44:29 +02:00
John Kleint
db65cf5a90 Fix non-sudo execution, add --sudo-user to ansible-playbook. 2012-05-07 19:58:16 -04:00
Seth Vidal
42b55a07cd fix indentation 2012-05-07 18:10:52 -04:00
Seth Vidal
f41fb90d78 fix the get_hosts() error in get_groups returning a dict not a list of group objects 2012-05-07 18:09:57 -04:00
Michael DeHaan
4694c3fbba Fixup the previous sudo_user support patch to work with playbooks. 2012-05-06 18:24:45 -04:00
Jim Richardson
a1ed9fc546 sudo -u works now. Needs testing and maybe a bit of cleanup 2012-05-06 18:24:45 -04:00
Jim Richardson
abcfdbeeaf first bit of getting sudo -u functionality 2012-05-06 18:24:45 -04:00
Jim Richardson
4d623d0356 sudo -u works now. Needs testing and maybe a bit of cleanup 2012-05-06 18:24:44 -04:00
Jim Richardson
98dda72be1 first bit of getting sudo -u functionality 2012-05-06 18:24:44 -04:00
Michael DeHaan
85a04a2517 Add missing file 2012-05-06 18:02:53 -04:00
Michael DeHaan
a7b9bf958d Add tests for new advanced inventory features (groups of groups, group variables) in the default INI format file. 2012-05-06 18:01:11 -04:00
Michael DeHaan
46c661b3e3 Further work on making the YAML inventory parser use the new inventory objects. 2012-05-06 17:03:17 -04:00
Michael DeHaan
c804752835 Fix playbooks such that they work with external inventory scripts. We really want to find out why the 'all' 
group isn't available, but group vars don't make sense for external inventory anyway.
 2012-05-06 15:00:17 -04:00
Michael DeHaan
3fb2d38514 Reinstate external inventory script support this time using the new more OO-ey inventory system. 
Next up: YAML format.
 2012-05-06 14:47:05 -04:00
Michael DeHaan
d9bec842ef missing files 2012-05-05 16:37:28 -04:00
Michael DeHaan
4011d15faa Refactored inventory to make it object oriented, need to make YAML format and executable script 
format compatible with this still, and add some tests for INI-style groups of groups
and variables.
 2012-05-05 16:31:03 -04:00
Michael DeHaan
81b8190fc5 Include files are no longer to be considered Jinja2 templates, but individual THINGS 
in included files can still be templated just like top level playbooks.  Resolves
some issues about statements being evaluated before facts were available
 2012-05-02 00:28:19 -04:00
Michael DeHaan
3eb00ec1e7 Merge branch 'devel' of https://github.com/skvidal/ansible into skvidal-devel 2012-05-01 22:58:47 -04:00
Seth Vidal
38ea61054f if a playbook has no vars - still include the global vars 2012-05-03 15:52:02 -04:00
Seth Vidal
dc35dd99c0 inventory group 'all' variables are global variables 
applied to every host and available all over
they are read in so that ones defined first can be used to define
the later ones.
 2012-05-02 18:30:58 -04:00
Jeroen Hoekx
03541baba7 Define 'inventory_hostname' variable for hosts. 2012-05-02 09:56:58 +02:00
John Kleint
cbbaee8a9f Remove command timeout. 2012-05-02 16:25:04 -04:00
Jeroen Hoekx
f14c1e3e91 Async: print one poll message per polling cycle. 
Instead of one per host per polling cycle.
 2012-05-01 18:38:26 -04:00
Jeroen Hoekx
029fe1273c Modify /usr/bin/ansible and playbooks to use the new async API. 2012-05-01 18:38:26 -04:00
Jeroen Hoekx
ce9a8c9ffc Introduce Async API in Runner. 2012-05-01 18:38:26 -04:00
Jeroen Hoekx
b87710a1df Introduce group_names in template variables. 
This is a list of all the groups a host is in.
 2012-04-28 18:23:44 +02:00
Michael DeHaan
6341361a5b Clarify that stderr WILL crash your module. Can't redirect because if we do we lose tracebacks 
from modules remotely when they fail to parse, and this is VERY useful data.
 2012-04-27 01:36:31 -04:00
Michael DeHaan
36e454c52f Because paramiko using a pty can't distinguish stderr and stdout, remove handling that 
treated -D as a way to show stderr, and make sure modules don't include things on stderr.
Update docs and test module script to come into line.
 2012-04-27 01:25:38 -04:00
Michael DeHaan
076f1bc169 Revert "Revert "Unify normal and sudo remote command execution. Breaks stderr/stdout handling" 
This reverts commit 40f603539c.
 2012-04-27 00:46:26 -04:00
Michael DeHaan
0d5bee2dfa Revert "Revert "Actually wait for password prompt in remote sudo execution. Totally breaks stderr debugging" 
This reverts commit e16114034c.

Conflicts:

	lib/ansible/connection.py
 2012-04-27 00:46:17 -04:00
Michael DeHaan
40f603539c Revert "Unify normal and sudo remote command execution. Breaks stderr/stdout handling 
This reverts commit 44486223ed.
 2012-04-27 00:33:48 -04:00
Michael DeHaan
e16114034c Revert "Actually wait for password prompt in remote sudo execution. Totally breaks stderr debugging 
and various modules.

This reverts commit 6341a9547f.
 2012-04-27 00:31:18 -04:00
Michael DeHaan
f939f3fdaf Playbook can now take a 'name' which it will show when starting the play 2012-04-27 00:08:06 -04:00
Michael DeHaan
67d1169674 fix code handling if module_vars is None 2012-04-26 23:18:29 -04:00
Michael DeHaan
aa8ae85070 Add playbook example for first_available_file 2012-04-26 23:03:14 -04:00
Michael DeHaan
3804910187 Some tweaks to first_available_file mostly in terms of error handling and not trying src= to be present 
as it is not used here.
 2012-04-26 23:00:33 -04:00
Seth Vidal
72fd971822 fall through file source list: first_available_file support 
add first_available_file look up to _execute_template and _execute_copy
to runner.

add this data to playbook handler so it can be included into module_vars
 2012-04-27 16:43:55 -04:00
Michael DeHaan
40f5469869 minor personal style preference on 'not' 2012-04-26 20:42:20 -04:00
Reed Murphy
abf524405a shlex.split() tries to read from stdin if passed None 2012-04-27 11:25:43 +10:00
Michael DeHaan
b9982fc17b Reinstate --extra-vars, which can do things in playbooks like: 
ansible-playbook release-my-app.yml --extra-vars="version=123"

And make $version available in the playbook without re-editing the file
 2012-04-26 19:57:07 -04:00
Michael DeHaan
5aa5a48f7f Merge pull request #250 from jkleint/devel 
Service module crashes if args has no "=".
 2012-04-26 16:22:56 -07:00
Michael DeHaan
a4b3b7a2cf Local connection doesn't need a port. 2012-04-26 19:19:34 -04:00
jkleint
6341a9547f Actually wait for password prompt in remote sudo execution. 
When running on lots of hosts with a large login banner on a slow network, it was still possible that the first recv() didn't to pull in the sudo password prompt, and sudo would fail intermittently.  This patch tells sudo to use a specific, randomly-generated prompt and then reads until it finds that prompt (or times out).  Only then is the password sent.  It also catches `socket.timeout` and thunks it to a more useful `AnsbileError` with the output of sudo so if something goes wrong you can see what's up.
 2012-04-26 15:01:20 -03:00
cocoy
1220a46e3a Bugfix for issue #245. 
Do not override the value of user and hostname.
Get port and identityfile only.
 2012-04-26 14:46:32 +08:00
jkleint
44486223ed Unify normal and sudo remote command execution. 
Commit SHA: 87b1cf45 that put temp files in `$HOME/.ansible` instead of `/home/<user>/.ansible` was producing a directory literally called `$HOME` (no expansion) with non-sudo remote execution.  I'll take the blame for this one, as `ParamikoConnection.exec_command()` was not using the shell for non-sudo commands.  This does sudo and non-sudo execution the same way, using the shell, so environment variables should get expanded.
 2012-04-25 13:40:21 -03:00
Seth Vidal
fa2aebc8a6 fix for issue #230 - handle template taking 3 args 2012-04-25 11:59:19 -04:00
Michael DeHaan
87b1cf45a4 Merge pull request #226 from cread/make-osx-tests-pass 
Use the $HOME env var instead of hard coding /home/<username>
 2012-04-24 15:22:43 -07:00
jkleint
4e1bc43645 Support YAML lists of hosts in playbooks. 
Reading the docs, I was a bit confused as to how to specify multiple hosts/groups in a playbook.  Being YAML, I assumed a normal YAML list would work:

    ---
    - hosts: [host1, host2]

But this crashes when inventory._matches() assumes hosts is a string.  This patch just checks if hosts is a list, and turns it into a string joined by ';'.
 2012-04-24 17:54:00 -03:00
Chris Read
dbb4afff50 Use the /Users/cread env var instead of hard coding /home/<username> 2012-04-24 21:45:54 +01:00
jkleint
b50c50748e _chain_file_module() calls .get() on error string 
runner._return_from_module() normally returns a list (?) of `[str,bool,dict,str]`, but on error it returns `[str,bool,str,str]`.  runner._chain_file_module() then tries to call .get() on the third item (`data2`), which fails when it's a string.  This patch only accesses `data2` if the return value was `ok`.  It might be better to return consistent types in both cases, but I'm not sure where/how else the return value is used.
 2012-04-24 17:21:01 -03:00
Seth Vidal
41619278e5 handle issues when the hostlist is inadvertently set executable 
and/or executing it fails. This produces a nicer error message than
a traceback
 2012-04-24 11:03:14 -04:00
Michael DeHaan
02abb5a83b Merge pull request #217 from jhoekx/connection-fixes 
Expand user in ssh identity file
 2012-04-24 07:40:33 -07:00
Jeroen Hoekx
973b1fe02e Fix incorrect merge of custom-facts branch. 
This fixes #216.
 2012-04-24 16:11:56 +02:00
Jeroen Hoekx
c2f1aefaf1 Expand user in SSH identity file. 2012-04-24 15:56:46 +02:00
Jeroen Hoekx
1804df0bae Whitespace fixes in connection.py 2012-04-24 15:56:04 +02:00
Matt Coddington
d34160ed26 cast ssh port number as integer 2012-04-24 00:38:24 -04:00
Michael DeHaan
89c013035e Merge branch 'integration' of https://github.com/cocoy/ansible into cocoy-integration 2012-04-23 21:30:44 -04:00
Michael DeHaan
bced4c9db1 Merge branch 'jhoekx-custom-facts' into devel 2012-04-23 21:25:26 -04:00
Michael DeHaan
49cca98f1e Merge branch 'custom-facts' of https://github.com/jhoekx/ansible into jhoekx-custom-facts 
Conflicts:
	lib/ansible/runner.py
 2012-04-23 21:24:52 -04:00
Michael DeHaan
346df537b4 Merge branch 'integration' of https://github.com/jkleint/ansible into jkleint-integration 2012-04-23 21:21:43 -04:00
Michael DeHaan
7de90c4e64 Version bump for integration branch (soon to be renamed 'devel'), didn't update package 
changelogs yet since this isn't released yet (but 0.3 is)
 2012-04-23 21:14:48 -04:00
Michael DeHaan
4d62510997 Version bump for 0.3 release 2012-04-23 21:11:43 -04:00
Michael DeHaan
a8707e48e8 Fix merge issue 2012-04-23 21:06:47 -04:00
Michael DeHaan
c00699d0ef Merge branch 'integration' 
Conflicts:
	lib/ansible/playbook.py
	lib/ansible/runner.py
	library/apt
 2012-04-23 21:05:06 -04:00
Michael DeHaan
321ed53e3a Fetch module doesn't set invocation parameter as it invokes nothing, so don't let that be an error. 2012-04-23 21:02:39 -04:00
jkleint
e69e078569 More robust remote sudo. 
The basic idea is sudo /bin/sh -c 'quoted_command'.  We use Paramiko's low-level API to set a timeout, get a pseudo tty, execute sudo and the (shell quoted) command atomically, wait just until sudo is ready to accept the password before sending it down the pipe, and then return the command's stdout and stderr.

This should be faster, as there are no unneeded sleeps.  There are no permissions issues reading the output.  It will raise socket.timeout if the command takes too long.  However, this is a per-read timeout, not a total execution timeout, so as long as the command is writing output and you are reading it, it will not time out.

Local and non-sudo commands remain unchanged, but should probably adopt a similar approach.

Since this is a significant change, it needs a lot of testing.  Also, someone smarter than I should double-check the quoting and execution, since it is a security issue.
 2012-04-23 17:32:08 -03:00
Jeroen Hoekx
2dc9a563ef Allow modules to return facts. 
If the module result contains "ansible_facts", that will be added to the setup
cache.
 2012-04-23 21:28:12 +02:00
cocoy
c844a2d072 Fix to skip /.ssh/config if don't exist rather than raise an error. 2012-04-23 14:32:57 +08:00
cocoy
645b7a2dff Add .ssh/config support 2012-04-23 09:48:42 +08:00
Michael DeHaan
533c2c6126 Make it possible to use facts from hosts in templates for other hosts. 
It works like this:

{{ hostvars['127.0.0.1']['ansible_eth0']['ipv4']['address'] }}
 2012-04-21 12:45:37 -04:00