Steve Frank
36027ddbba
Squashed commit of the following:
...
Changed ami_tags to instance_tags to better follow naming convention
Add support for creating tags on the new instances
2013-02-09 11:43:30 -05:00
Michael DeHaan
a894791767
Slightly friendlier error on missing hosts file, slightly friendlier error on inventory script returning invalid syntax
...
(or if inventory is non-script and accidentally executable).
2013-02-09 11:37:55 -05:00
Brian Coca
ca5f52b825
now missing hosts file gives nice message and no traceback
...
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-02-09 11:32:18 -05:00
Brian Coca
0e8627b7e8
added block device info gathering, full for linux, partial for freebsd added prettyfing byte function Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
...
moved moutns out of devices Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-02-09 11:15:22 -05:00
Matt Cordial
2ccfc8d2b6
Fix Issue #2025 where templates were not being transfered.
2013-02-08 12:03:54 -07:00
Michael DeHaan
a9162a86f2
Very basic --diff option for showing what happens when templates change.
...
Probably output is not useful if not used with --limit
Works well with --check mode
2013-02-07 22:52:25 -05:00
Daniel Hokka Zakrisson
f3305564e2
Add stderr contents to parse errors
2013-02-07 23:50:00 +01:00
Daniel Hokka Zakrisson
19f3cf45f4
Merge pull request #1982 from dex4er/feature_j2_filter_safe_yaml
...
Use yaml.safe_dump rather than yaml.dump. No more "!!python/unicode".
2013-02-07 13:24:08 -08:00
Daniel Hokka Zakrisson
dddfeac9c4
Allow using ${hostvars.<node>} for nodes not in SETUP_CACHE
...
This allows accessing inventory data from nodes that have not been
talked to (yet).
2013-02-07 18:40:41 +01:00
Daniel Hokka Zakrisson
ffd4ae11b8
Merge pull request #1993 from fdavis/timeout_ssh
...
Add ConnectTimeout=DEFAULT_TIMEOUT to ssh args
2013-02-07 03:20:46 -08:00
Daniel Hokka Zakrisson
70d5dad726
Also catch NameErrors which would indicate missing quotes
2013-02-07 11:56:59 +01:00
Daniel Hokka Zakrisson
bc709e7b67
expand_lists should default to False
2013-02-07 11:56:59 +01:00
fdavis
21a5c55921
Add ConnectTimeout=DEFAULT_TIMEOUT to ssh args
2013-02-06 23:42:04 -08:00
Daniel Hokka Zakrisson
98f0a9210e
Raise an error when multiple when_* statements are provided
...
Fixes #1994 .
2013-02-07 08:11:30 +01:00
Daniel Hokka Zakrisson
d5e63332fe
Raise an error if an action doesn't have a string type
...
Happens with e.g. "command: true" that YAML helpfully converts to a
bool.
2013-02-06 16:41:34 +01:00
Rune Kaagaard
7a8b27f716
Fixing bug with unicode templates.
...
The utils.md5s() function would break when calculating checksums
for non-ascii characters. Convert to utf-8 first.
2013-02-05 14:49:59 +01:00
Daniel Hokka Zakrisson
c1b63d1500
Fix for when conditional is a simple bool already
...
Fixes #1983 .
2013-02-04 20:12:53 +01:00
Piotr Roszatycki
8cf268441e
Use yaml.safe_dump rather than yaml.dump. No more "!!python/unicode".
2013-02-04 13:40:07 +01:00
Daniel Hokka Zakrisson
1becc665b2
Fix missing ) in add_host
...
Fixes #1980 .
2013-02-04 12:21:33 +01:00
Michael DeHaan
fed82c2188
This implements a basic --check mode which for now is only implemented on template & copy operations. More detail will be shared with the list
...
shortly.
2013-02-03 20:34:13 -05:00
Daniel Hokka Zakrisson
d8d1f2cd7a
Split PATH on os.pathsep, that is what it's there for
2013-02-03 23:57:34 +01:00
Daniel Hokka Zakrisson
a025cfcb33
Add on_import_for_host callback from non-list case
2013-02-03 23:37:29 +01:00
Daniel Hokka Zakrisson
a79373f6b2
Make template_ds the only templater
...
Instead of having to remember when to use which one, rename template_ds
to template and move the last bit of code from template to varReplace
(which gets used for all string replacements, in the end).
This means that you can template any data type without worrying about
whether it's a string or not, and the right thing will happen.
2013-02-03 14:01:54 +01:00
Michael DeHaan
f7aaa5ccc5
Fix copyright, unused imports
2013-02-02 13:06:48 -05:00
Michael DeHaan
857ccf7f6c
Add random choice plugin (with_random_choice)
2013-02-02 13:02:47 -05:00
Michael DeHaan
318e3302fb
Fix up some version related things on the devel branch.
2013-02-01 21:38:21 -05:00
Daniel Hokka Zakrisson
f7e286cf34
Fix error format for invalid vars_files
2013-01-31 20:25:28 +01:00
Seth Vidal
83b9654c63
stop updating SETUP_CACHE in run_play as per comment on pr 1945
2013-01-31 11:24:22 -05:00
Seth Vidal
f649777072
- make extra-vars override all other vars and facts in playbooks
2013-01-30 11:56:04 -05:00
Daniel Hokka Zakrisson
b79960e13b
If failed lookups are fatal, re-raise the exception
...
Fixes #1938 .
2013-01-29 10:31:33 +01:00
Daniel Hokka Zakrisson
e166f71fcc
Get output before receiving return code
...
Fixes hangs observed with large amounts of output, as it would get into
a dead-lock.
2013-01-29 00:38:07 +01:00
Michael DeHaan
4d8f3b0924
This standardizes the apt_key module some
...
* improves error handling and reporting
* uses run_command to reduce code
* fails quicker on errors as opposed to return codes and tracebacks
* can now also specify the key as data versus needing to wget it from a file
2013-01-28 15:48:55 -05:00
Daniel Hokka Zakrisson
5268d49bad
Add sudo_flags configuration option to alter sudo behaviour
...
Default to -H to set $HOME appropriately.
2013-01-28 17:41:43 +01:00
Les Aker
f4eed3710b
fixed check for required_together
2013-01-27 12:39:35 -05:00
Michael DeHaan
0030a2bd09
Allow handler files to be empty lists.
2013-01-27 10:40:29 -05:00
Michael DeHaan
0c2f67ef66
Merge pull request #1923 from fdavis/ans_env_addition
...
add env vars for plugins action,callback,connection,lookup,vars,filter
2013-01-26 10:30:39 -08:00
Michael DeHaan
36066d8664
Fixup ec2_facts docs parsing
2013-01-26 12:34:30 -05:00
fdavis
925c1a4611
add env vars for plugins action,callback,connection,lookup,vars,filter
2013-01-26 09:25:35 -08:00
Daniel Hokka Zakrisson
4d71b31f7e
Ensure destination and source are available before mangling them
...
Fixes #1918 .
2013-01-25 23:14:52 +01:00
Daniel Hokka Zakrisson
6f9099c51d
Merge pull request #1898 from silviud/fix_inventory_list_groups
...
Inventory class - lambda fails on attribute access - g.name is a string not the group obje...
2013-01-25 08:35:03 -08:00
Daniel Hokka Zakrisson
53fd85e2c4
Merge pull request #1903 from leucos/mergeable-hash-vars
...
Adds user-selectable hash merging support in vars
2013-01-25 08:29:05 -08:00
Daniel Hokka Zakrisson
864b75e54b
Override Jinja2 Template class to make {% include %} work again
...
Fixes #1908 .
2013-01-25 14:16:29 +01:00
Michel Blanc
8eb7d740b0
Fixes hash merging
...
No need for deep copy (vars are essentially immutable once loaded, there
should not be any modifications)
2013-01-24 00:53:12 +01:00
Michel Blanc
e28e538c6e
Adds user-selectable hash merging support in vars
...
Hash variables are currently overriden if they are redefined. This
doesn't let the user refine hash entries or overriding selected keys,
which can, for some, be a desirable feature.
This patch let the user force hash merging by setting the
hash_behaviour value to "merge" (without the quotes) in ansible.cfg
However, by default, ansible behaves like it always did and if any value
besides "merge" is used ("replace" is suggested in the example ansible.cfg
file), it will also behave as always.
2013-01-23 21:39:34 +01:00
Bowe Strickland
2b3d6d4545
protect PluginLoader._extra_dirs from appending None
...
PluginLoader.add_directory() can receive None from, for example,
Inventory.add_directory(self.basedir()) if host_list is a custom list.
None has no reasonable interpretation other than ignore it.
2013-01-23 13:55:12 -05:00
Silviu Dicu
f7694ac433
lambda fails on attribute access - g.name is a string not the group object
2013-01-23 11:44:23 -05:00
Daniel Hokka Zakrisson
94a1c221bc
Update variable precedence section with current rules
2013-01-22 16:56:04 +01:00
Daniel Hokka Zakrisson
a16ddb57c1
Default module search path is included already
...
Adding it to runner's module_path makes it override local modules.
2013-01-22 15:42:49 +01:00
Daniel Hokka Zakrisson
35b58955d6
Fix paramiko for when no private key is specified
2013-01-21 21:48:02 +01:00
Michael DeHaan
ef38e9f0e6
Merge pull request #1875 from cocoy/vars_prompt_default
...
Adding default on vars_prompt
2013-01-21 06:57:50 -08:00
Tim Gerla
4c64d0d6be
Expand ~ shell shortcuts for the --private-key argument
2013-01-20 13:16:29 -08:00
Michael DeHaan
35c7ebf7a4
Revert "Update lib/ansible/utils/__init__.py"
...
Reported hanging of no-password sudo in some cases. Need to explore.
This reverts commit 87f6739e20
.
Conflicts:
lib/ansible/utils/__init__.py
2013-01-20 09:05:07 -05:00
ron1
280660b8a7
Support sudo alternatives that offer sudo-compatible interfaces
2013-01-19 08:40:32 -05:00
Rodney Quillo
395093e0bf
Move default arguments to the end of the function call.
2013-01-19 08:34:47 +08:00
Michael DeHaan
c8fc353bc3
Merge pull request #1811 from fdavis/devel
...
add when_{failed,changed}, and extended when_{set,unset}
2013-01-18 15:18:00 -08:00
Michel Blanc
87f6739e20
Update lib/ansible/utils/__init__.py
...
Adds -i to make_sudo_cmd so target user's environment gets loaded when configurationslike this are used :
- hosts: ubuntu
name: Install ruby for the configured ruby user
sudo: True
sudo_user: rubyuser
# should be ${ruby_user}, but can't for now because of #1665
tasks:
- name: Gets current ruby version
action: shell rbenv version
register: ruby_current_version
2013-01-18 16:03:50 +01:00
Rodney Quillo
7ae100611c
Adding default on vars_prompt
2013-01-18 19:00:57 +08:00
Stephen Fromm
4eaee3df0a
Various cleanup to run_command
...
* Rename fail_on_rc_non_zero to check_rc, much more succinct.
* Simplify method defintion
* Fix command module and drop shell=shell option; whether to use
shell is determined by if args is a list.
2013-01-13 11:24:21 -08:00
Stephen Fromm
300531507b
Add method run_command to module_common.py
...
This adds a helper method that modules can call to execute a command via
subproces. It takes two arguments: the command to run and
keyword options that control how the process is executed. Supported
options are: fail_on_rc_non_zero, close_fds, and executable.
fail_on_rc_non_zero will call fail_json if the command fails. If
args is a list, the command will be run with shell=False; otherwise, if
a string, it will be run with shell=True. Otherwise, run_command() returns
the returncode, stdout, and stderr.
2013-01-13 08:30:33 -08:00
Daniel Hokka Zakrisson
d11262af4d
Fix raw (no executable) support on -c local
2013-01-13 15:16:13 +01:00
Daniel Hokka Zakrisson
5231be5d4b
Add sudo password support for local
2013-01-13 15:16:13 +01:00
Daniel Hokka Zakrisson
7ecab22302
Move sudo command making to one common function
2013-01-13 15:16:13 +01:00
Sergey Popov
e41f89d507
Fix distribution detection - return string instead of functions
2013-01-10 15:13:35 +04:00
Jayson Vantuyl
13ddd39db9
add with_sequence lookup plugin
...
Plugin allows you to do easy counts for items.
2013-01-09 15:30:24 -08:00
Dag Wieers
fb802beee7
In PR #1804 the use of C in script was moved to _low_level_execute_command()
...
So we cannot get rid of this one now.
2013-01-09 15:54:10 +01:00
Daniel Hokka Zakrisson
7782923ea2
Revert #1818 but avoid double-dwim, fixing relative fileglob
2013-01-09 14:52:52 +01:00
Daniel Hokka Zakrisson
891b1e371a
Default to not using an executable
...
For compatibility with older releases as well as avoiding things like
action: raw executable= show status
to communicate with devices that don't have sh.
2013-01-09 14:15:47 +01:00
Daniel Hokka Zakrisson
92ad206b84
Use re instead of shlex.split to find executable
...
shlex.split will strip quotes and it might not even be sh at this point.
2013-01-09 14:13:53 +01:00
Michael DeHaan
910667152c
Merge pull request #1843 from dagwieers/import-cleanup
...
Clean up imports (taken from PR #1804 )
2013-01-09 04:56:58 -08:00
Dag Wieers
b781438480
Clean up imports (taken from PR #1804 )
2013-01-09 13:51:27 +01:00
Daniel Hokka Zakrisson
87b2378e22
Resolve variable references inside variables
...
Fixes the case where variable x is '$y' and y is a dict(foo='bar') and
an attempt to access ${x.foo} is made.
2013-01-09 13:45:55 +01:00
fdavis
fe310dcff1
add when_failed, when_changed, and extended when_set/unset
...
This commit extends the 'when_' conditions to failed and changed
json results
Additionally it makes when_{set,unset,failed,changed,int,str,flt}
behave more similiarily in that they all except and/or/not logic
2013-01-08 19:51:48 -08:00
Daniel Hokka Zakrisson
1b5d039bf4
Extend executable= support in raw to include no execuable
...
Useful for managing not-UNIX things.
2013-01-08 17:45:37 +01:00
Daniel Hokka Zakrisson
4955587d8c
Merge pull request #1798 from dagwieers/raw-executable
...
Allow to change executable (shell/interpreter) when using raw
2013-01-08 08:35:08 -08:00
Daniel Hokka Zakrisson
c23eda82c2
Allow pattern[0] to address a single node
...
Replaces erroring out on it and requiring the abysmal pattern[0-0]
instead.
2013-01-07 18:20:09 +01:00
Michael DeHaan
03ab074d0d
Merge pull request #1821 from leucos/path-expand-fix
...
Expands path on file operations
2013-01-07 05:05:20 -08:00
willthames
4e50478a05
Fix behaviour when file handles a path with tilde
...
Two problems here
* unchecked exception handling and erroneous assumption as to why
an exception might fire
* although the file module expands the path, when using file_args
the unexpanded path is passed.
Expected result: ~/path/to/file should work fine
Actual result: exception is because it doesn't find file with a message
about not being able to get the selinux context
2013-01-07 16:30:29 +10:00
Daniel Hokka Zakrisson
4d48daff80
Actually allow using connection: on a task
2013-01-06 18:46:34 +01:00
Daniel Hokka Zakrisson
637370089a
Skip polling when all hosts were skipped
...
Fixes #1823 .
2013-01-06 16:49:29 +01:00
Daniel Hokka Zakrisson
947ec34116
Merge pull request #1807 from willthames/openlog_unicode_fix
...
syslog.openlog does not cope with unicode first argument
2013-01-05 08:17:03 -08:00
Michel Blanc
7d7e7fb8bc
Adds path expansion to two other methods
...
set_owner_if_different and set_group_if_different seems to need path
expansion too
2013-01-04 13:41:31 +01:00
willthames
411b2bf7d9
Added additional template variables
...
Added two additional template variables
* template_fullpath - absolute path to the template
* template_run_date - date that the template was rendered
Documented these additional variables in the module documentation
2013-01-04 16:36:02 +10:00
Daniel Hokka Zakrisson
caee51e90e
Allow only_if/when_* on task includes and apply it on all tasks within
2013-01-04 00:15:13 +01:00
Daniel Hokka Zakrisson
07b215d4fa
Check for non-accepted arguments combined with task includes
...
Throw an appropriate error for it.
2013-01-03 23:36:42 +01:00
Daniel Hokka Zakrisson
68f736e8d7
Make inventory variables available to vars_files
2013-01-03 23:16:38 +01:00
Daniel Hokka Zakrisson
a1877b2213
Allow infinite depth task includes
2013-01-03 23:01:04 +01:00
Daniel Hokka Zakrisson
4555cdc49c
Allow using connection: on the task level
...
This is the name of the setting on the play level, and the options.
Should be consistent.
2013-01-03 21:27:01 +01:00
Michel Blanc
0037a19389
Expands path on file operations
...
Path might have to be expanded on some operations. It seems that path
containing '~' are not.
Using os.path.expanduser in appropriate places solves the problem, but
this might be required in many other places.
2013-01-03 16:39:57 +01:00
Stephen Fromm
2100a35663
Update path_dwim() to return absolute path
...
If path_dwim() is provided a relative path to a file, it will now return an
absolute path of the playbook directory + the relative file path.
2013-01-02 21:53:00 -08:00
willthames
5ef077e58c
syslog.openlog does not cope with unicode first argument
...
It seems that os.path.basename(__file__) can return a unicode
string. In this case syslog.openlog fails. Forcing the result
to a string causes the resulting error to go away.
2012-12-27 14:54:16 +10:00
Dag Wieers
eb36ff45b9
Make script module use raw module so it does not require python
2012-12-24 00:24:34 +01:00
Dag Wieers
846161a1a4
Allow to change executable (shell/interpreter) when using raw
...
This patch adds an optional 'executable=' option to the raw command line to override the default shell (/bin/sh), much like the shell module does.
2012-12-23 20:49:02 +01:00
Dag Wieers
988db558b3
Add return code and error output to raw module
...
Since we use 'raw' heavily on equipment where 'command' and 'shell' are not (yet) working (and python may need to be installed first using raw) these improvements are necessary in order to write more complex scripts (with return code handling and separated stdout/stderr).
This change includes the following changes:
- exec_command() now returns the return code of the command
- _low_level_exec_command() now returns a dict, including 'rc', 'stdout' and 'stderr'
- all users of the above interfaces have been improved to make use of the above changes
- all connection plugins have been modified to return rc and stderr
- fix the newline problem (stdout and stderr would have excess newlines)
In a future commit I intend to add assertions or error handling code to verify the return code in those places where it wasn't done. Since only the output was available, the return code was ignored, even though we expect them to be 0.
2012-12-23 18:04:54 +01:00
Daniel Hokka Zakrisson
d4c63e3300
Ensure each basedir is only added to the search path once
...
Fixes #1790 .
2012-12-20 14:17:12 +01:00
Daniel Hokka Zakrisson
3a36c024da
Make lookups being fatal up to the caller
...
Fixes #1769 .
2012-12-19 19:19:04 +01:00
Daniel Hokka Zakrisson
97cc384ccf
Set basedir to . if there isn't one
...
This avoids special-casing '' = '.' everywhere the basedir gets used.
Fixes #1729 .
2012-12-19 13:22:57 +01:00
Daniel Hokka Zakrisson
0f1706220b
Add support for using the Jinja2 built-ins such as range
2012-12-19 09:42:15 +01:00
Michael DeHaan
d34e320e12
Merge pull request #1733 from dhozac/lookup-list
...
Make all lookup plugins accept lists as arguments
2012-12-17 16:53:01 -08:00
Michael DeHaan
04195e202d
Merge pull request #1747 from njharman/alpharange
...
Alphabetic inventory hostname patterns.
2012-12-17 16:52:11 -08:00
Michael DeHaan
4bcdd24688
Merge pull request #1776 from junegunn/inventory-group-var-ws
...
Allows whitespaces around assignment operators when defining group variables
2012-12-17 16:51:49 -08:00