Commit Graph

90 Commits (2cf30148ba4cc6ea9723ec70ffa85dfc2fb488a3)

Author SHA1 Message Date
Michael DeHaan 4bea9a612f Don't use "finally" here as it's not 2.4 compliant. 2013-04-28 16:03:03 -04:00
Brian Coca caf6bd6ce5 Changed atomic_replace to atomic_move, now ti DOES move atomically in the last
step
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-04-27 11:46:08 -04:00
Aaron Brady bd226eb826 Refactor user_and_group so it works off of numbers
There are various cases where a UID to username to UID mapping breaks
down. One UID can be used by two usernames, or no username. If we
always use UIDs internally, then these ambiguous cases won't be a
problem.
2013-04-25 13:23:07 +01:00
Aaron Brady d2e457f81f Accept numeric user and group parameters 2013-04-25 13:23:07 +01:00
Stephen Fromm 189b210f5a Catch exception when logging to systemd journal fails
systemd journal will throw IOError exception when journal.sendv() fails.
This catches that and falls back to syslog.  See issue #2773.
2013-04-24 15:00:47 -07:00
Dale Sedivec c8f4a56cad Don't send unicode instances to the selinux module
This fixes #2632.  Briefly: specifying things like paths using complex
args in a playbook will make the objects unicode instances.  The selinux
module does not accept unicode instances for its char * arguments; it
wants str instances.

Per mpdehaan's comment on #2632 I just went ahead and converted all
paths to UTF-8.  I don't know if it would be better to do something like
converting to locale.getpreferredencoding(), but I factored all the
conversions out into new method _to_filesystem_str, so there's only one
place that needs to be changed in the future.
2013-04-19 20:12:11 -05:00
Michael DeHaan 5f1e2afc34 Revert "make atomic_replace use shutil.copy2 instead of os.rename() so it will work across filesystems".
AR function was leaving some tmp files behind, want to revert, will have better implementation soon, this is the old way now.

This reverts commit f74a1fa4f0.
2013-04-18 15:46:42 -04:00
Seth Vidal f74a1fa4f0 make atomic_replace use shutil.copy2 instead of os.rename() so it will
work across filesystems
2013-04-16 15:15:58 -04:00
Michael DeHaan 49d28b9a44 This SELinux commit is too strict and we should only fail if trying to read/tweak SELinux attributes else
python-selinux can't be installed w/ the yum module when missing.

Revert "Added an extra check for target nodes with selinux but without libselinux-python package installed"

This reverts commit 550986b6a1.
2013-04-05 14:54:11 -04:00
Fabian Arrotin 550986b6a1 Added an extra check for target nodes with selinux but without libselinux-python package installed 2013-04-05 20:37:58 +02:00
Stephen Fromm cdb7f8ecf0 Make logging to journal match what goes to syslog on non-systemd hosts
This makes the log message the same, whether it is sent to systemd's
journal or to syslog.  It retains the extra fields that are passed to
journal, such as MOUDLE=<name> and additional arguments.  Since journal
will reflect messages to syslog, this keeps what goes to syslog
informative instead of the terse 'Ansible module invoked'.

See issue #2461.
2013-03-19 16:07:15 -07:00
Daniel Hokka Zakrisson 27978ed9c1 Don't override argument specs with FILE_COMMON_ARGUMENTS
Doing so will remove aliases, types, etc, leading to #2388 and other
issues.
2013-03-14 11:22:46 +01:00
Michael DeHaan 0c80c76833 Fixes #2380 - argument checking in file accepts chained arguments from copy 2013-03-12 21:57:38 -04:00
Michael DeHaan 77198b09e9 Add content to the list of file common arguments. 2013-03-12 01:06:55 -04:00
Michael DeHaan e241bb5801 Merge pull request #2367 from bcoca/catch_mismatched_json
now cleanly catches traceback when conflicting versions of simplejson and python are installed
2013-03-11 15:26:01 -07:00
Michael DeHaan 6e2ea327d1 A very simple fix to enable spaces in the files sent via the copy module. 2013-03-11 17:11:53 -04:00
Brian Coca 95a977cfc9 now cleanly catches traceback that occurs when running newer simplejson with
older python interpreter.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-03-11 15:10:49 -04:00
Michael DeHaan bb696e88b4 Merge pull request #2286 from gavares/url_timeout
Add socket timeout to uri module.
2013-03-10 15:37:32 -07:00
Jim Kleckner 92844d3dcd Minor spelling fixes 2013-03-06 10:41:19 -08:00
Daniel Hokka Zakrisson 3d49f74df6 Make apt upgrade=dist work and make its argument handling more idiomatic
Fixes #2287.
2013-03-05 23:46:34 +01:00
Grant Gavares cd51c7f234 Add socket timeout to uri module.
The uri module can be configured to abort after a specified timeout if
it cannot connect to the configured uri. This prevents a uri action from
hanging indefinitely when the remote endpoint cannot be reached because
it is unavailable, there is a firewall in place etc. The default behavior
is left unchanged: timeout=None

This change also introduces a new type for module_parameters: int
Code was added to perform conversion from string -> int type in
module_common.py.

The new type was required in order to play nice with httplib2 which
refuses to accept (and convert) anything other than a numeric type for
the timeout value.
2013-03-02 17:34:23 -08:00
Brian Coca 46c913f7a6 now ansible shows nice message about missing json instead of traceback
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-03-01 19:03:59 -05:00
Daniel Hokka Zakrisson ae8d6ac303 Ensure complex_args is considered in all action_plugins 2013-02-28 14:27:42 +01:00
Michael DeHaan 1366c663eb Merge branch 'copy-diff-take2' of git://github.com/stoned/ansible into better_diff
Conflicts:
	library/file
2013-02-26 20:51:32 -05:00
Daniel Hokka Zakrisson 93f02d614b Merge pull request #2187 from dhozac/argument-type-check
Add type checking for module arguments, converting as much as possible
2013-02-26 14:05:36 -08:00
Stoned Elipot 10e9f1fc1e Implement --diff for the copy module. 2013-02-25 23:32:52 +01:00
Seth Vidal f02ea15f0c command: make sure that all _handle_aliases() calls returns {}
module_common: also work if there are no aliases (shell, command, etc) modules
2013-02-25 17:07:47 -05:00
Seth Vidal c95848ae59 - add an aliases attribute as a lookup of aliasname to canonical name
of parameters
- add support for no_log attribute per-parameter which will not log
  that information to syslog
2013-02-25 16:33:04 -05:00
Daniel Hokka Zakrisson 9076f8eb31 Add type checking for module arguments, converting as much as possible
Converts to list from comma-separated strings, and to dicts from
comma-separated, key=value strings.

Fixes #2126.
2013-02-23 19:43:50 +01:00
Michael DeHaan f02b9987fc We all agreed on the list that the ansible module common module snippet, since it's dynamically embedded in modules on the fly, should
be a BSD licensed snippet so that it's ok to write proprietary modules.  The actual license of Ansible (GPLv3) or any modules
written for ansible (any) do not change.
2013-02-17 15:41:59 -05:00
Michael DeHaan 1ecf4a6943 Working on complex argument support. 2013-02-17 15:01:49 -05:00
Michael DeHaan cd32597af0 Make the file module work as expected in check mode 2013-02-17 12:27:00 -05:00
James Martin 7129a9e355 Using "OtherLinux" in module_commons, cleander detection in setup. 2013-02-16 13:32:48 -05:00
James Martin 5646bc278b Support for amazon linux distribution facts. 2013-02-16 13:32:48 -05:00
Chris Hoffman 9057f72881 Removing duplicate import, adding missing import 2013-02-10 18:31:55 -05:00
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
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
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
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
Les Aker f4eed3710b fixed check for required_together 2013-01-27 12:39:35 -05: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
Sergey Popov e41f89d507 Fix distribution detection - return string instead of functions 2013-01-10 15:13:35 +04: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
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
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
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
Stephen Fromm ccca5fcd1c Ensure files created by authorized_key have correct selinux context
Three changes:
* Add set_default_selinux_context() to module_common that sets
  a file's context according to the defaults in the policy
* In atomic_replace(), set the default context for the file if
  selinux is enabled and the destination file does not exist.
* In authorized_key, set the default context when creating
  $HOME/.ssh and $HOME/.ssh/authorized_keys.  If these already
  exist, this won't touch them.
2012-12-13 16:35:49 -08:00