Commit graph

353 commits

Author SHA1 Message Date
Mark Theunissen
6afe3fd497 Changing to read from a file pointer instead so that an exception is thrown if the file doesn't exist 2012-07-26 08:58:21 -05:00
Nikhil Singh
daf44331c4 Code review changes
1. Passing the module to the various functions so that they can use module.fail_json and module.exit_json methods inside.
2. Because of point 1, install and remove methods do not return anything. Instead, they use the module functions itself.
3. Move the import statement (for apt and apt_pkg) inside main function so on import error, we can use module.fail_json to print the error.
2012-07-26 17:29:15 +05:30
Nikhil Singh
dd9e09dee6 Adding dict() for json.dumps 2012-07-26 16:24:10 +05:30
Nikhil Singh
4c8d949642 Standardizing the apt module 2012-07-26 16:21:49 +05:30
Stephen Fromm
1727bd3b7a Update git module to handle branches better
This drops the branch option.  The version option is overloaded
to mean either a sha1, branch, or tag.  This also adds the option
'remote' which defaults to 'origin'.
clone() was simplified by removing the checkout operation.  That
happens later when switch_version() is called.

Added the methods get_branches(), is_remote_branch(), and
is_local_branch().  get_branches() returns an array listing all
of the branches for the git repository.  is_remote_branch() checks
whether the arguments supplied correspond to a remote branch.
Similarly, is_local_branch() checks for a local branch.

The pull() method now checks to see if it is on the desired branch.
If not, it checks out the requested branch and then does a pull.
This should keep issue #604 still fixed.

switch_version(), formerly switchver(), looks to see if it is
checking out a branch.  If a branch, it checks it out with the --track
option.  This type of checkout was in pull() before.

Updated pull, clone, and switch_version to return (rc, out, err).
2012-07-26 00:22:30 -07:00
Michael DeHaan
2030f82bf2 Further standardize the yum module 2012-07-25 20:14:15 -04:00
Michael DeHaan
1584eda3f8 Merge pull request #684 from nix85/fix_yum_mod
Standardizing the yum module
2012-07-25 17:33:55 -07:00
Mark Theunissen
12979cf834 Change modules to use credentials in my.cnf if they are available 2012-07-25 16:31:12 -05:00
Stephen Fromm
40eaf282ea More cleanup in assemble module for module magic (tm) 2012-07-25 09:24:10 -07:00
Nikhil Singh
b47bed9601 Standardizing the yum module 2012-07-25 19:45:41 +05:30
Michael DeHaan
772e241d1f shorten up the assemble module 2012-07-24 19:44:53 -04:00
Michael DeHaan
f787cda7be Merge pull request #675 from jpmens/assemble1
convert sfromm's assemble to module-magic
2012-07-24 16:41:25 -07:00
Michael DeHaan
f4a4649086 Port async_status to use the new common code. 2012-07-24 19:03:18 -04:00
Michael DeHaan
45354c6be5 Port command module over to new common code. Notice that this has to subclass AnsibleModule -- this should be the only
one that has to do that.
2012-07-24 18:52:52 -04:00
Michael DeHaan
2d1c297fb8 Merge pull request #674 from nix85/fix_facter_mod
Standardizing the module
2012-07-24 11:54:50 -07:00
Jan-Piet Mens
f6fe9124b8 convert assemble to module-magic 2012-07-24 18:35:06 +02:00
Nikhil Singh
8bbcef6f13 Standardizing the module 2012-07-24 21:08:56 +05:30
Mark Theunissen
97cc259d8c Undefined variable error 2012-07-24 09:26:45 -05:00
Nikhil Singh
483f7fd625 Standardizing the mount module 2012-07-24 17:00:08 +05:30
Michael DeHaan
2cda36f7dc Merge pull request #664 from jpmens/a1
Fix file module to support = in args; remove superflous call in get_url
2012-07-24 03:39:30 -07:00
Christoph Seitz
ab8a36686e Fixes locale problem with ifconfig in setup module 2012-07-24 11:10:11 +02:00
Jan-Piet Mens
628b289ab3 Fix file module to support = in args; remove superflous call in get_url 2012-07-24 06:40:34 +02:00
Michael DeHaan
ec12cc4154 Save the transfer of the module file for new style modules, because we can inject the arguments into the modules.
Module consumers using the API don't have to know how this works.  base64 stuff is only there
because escaping a docstring inside a docstring was a bit of a challenge :)
2012-07-23 19:18:45 -04:00
Stephen Fromm
f068bedfa1 Update user module to use new shared module code 2012-07-23 11:29:59 -07:00
Mark Theunissen
12e23a1a6c Upgrading MySQL user module to new format 2012-07-22 12:11:39 -05:00
Michael DeHaan
0b891fc8fb Tweaking daisychain internals to allow get_url to modify the path destination when downloading to a directory.
Minor module refactoring.
2012-07-22 11:08:16 -04:00
Michael DeHaan
46650cfcec Merge branch 'get_url3' of https://github.com/jpmens/ansible into devel 2012-07-22 10:08:27 -04:00
Stephen Fromm
1a9c54b1e1 Update group module to use new shared module code 2012-07-21 22:30:13 -07:00
Mark Theunissen
efb60776f4 Upgrading to new shared module code 2012-07-21 18:02:34 -05:00
Michael DeHaan
9f149c9f1a imports not needed 2012-07-21 17:25:47 -04:00
Michael DeHaan
d0f4358730 Port the copy module over to the new "common module" logic. 2012-07-21 17:07:42 -04:00
Jan-Piet Mens
b8d7b5041b new module: get_url
get module (with new module-magic-code!)
	Usage: ansible -m get -a "url=http://xxxxxxx  dest=fileordirctory"
	all cleanups as per @mpdehaan's suggestions
	add daisychain
	added example playbook (get_url.yml) with URLencode example
2012-07-21 13:34:42 +02:00
Stephen Fromm
2a0dfba838 Skip get_ipv6_facts if socket.has_ipv6 is false 2012-07-20 17:19:26 -07:00
Stephen Fromm
fd059a3df2 Fix for issue 604
Do not switch to master branch in pull()
Add --track to git checkout, when checking out a remote branch to track.
2012-07-20 10:43:26 -07:00
Michael DeHaan
70ef8e9ebb Merge pull request #637 from goozbach/git-mkdir
git mkdir causes problems with older git (can't c/o to existing directory)
2012-07-20 06:54:20 -07:00
Derek Carter
f0f8eb3445 git mkdir causes problems with older git (can't checkout to existing directory) 2012-07-20 09:48:18 -04:00
Michael DeHaan
b114a6075f Merge pull request #631 from sfromm/facts
Update setup module for facts derived from classes - take 2
2012-07-20 03:58:42 -07:00
Michael DeHaan
d69e70db01 By defining a main function here, and including it ahead of the boilerplate insertion symbol, tracebacks are
now accurate with respect to the main function, but may include lines not in the original file.  A lot better
than before, where they were offset.
2012-07-20 06:37:46 -04:00
Stephen Fromm
0efc0bec89 Update LinuxNetwork to not use fcntl and ioctls
get_interfaces() updated to read /proc/net/dev.  This means it no
longer provides only interfaces that are up.

get_iface_hwaddr() updated to read from /sys/class/net/<iface>/address.

Added get_interface_facts() to pull in mac address and interface mtu.
Can be used later for additional interface-facts.

Added get_ipv6_facts(), which reads from /proc/net/if_inet6.

get_network_facts() renamed to get_ipv4_facts().  It still calls
ifconfig to determine ipv4 facts.
2012-07-19 23:50:13 -07:00
Stephen Fromm
162b78ea5c Check if CPU is QEMU via different mechanism
The processor fact doesn't exist in LinuxVirtual.  Read /proc/cpuinfo
and check if it is QEMU.
2012-07-19 23:50:12 -07:00
Stephen Fromm
e3dd25b1b2 Add back erroneously deleted get_file_content() 2012-07-19 23:50:12 -07:00
Stephen Fromm
97c64f3632 Adjustments to behavior of Facts and subclass behavior
The Facts class and subclasses no longer take a dict argument for
instantiation.  populate() now returns self.facts.
Other changes:
- Facts.__init__() takes over most of the work from populate() so that
  subclasses can benefit from its knowledge.
- Drop setting unknown facts to 'NA' in __init__() in various
  subclasses.
- Check for presence of facts in get_virtual_facts()
- Update ansible_facts() to use facts.update(<classname>().populate())
2012-07-19 23:50:12 -07:00
Stephen Fromm
ae1b2394ac Update setup module for facts derived from classes
This changes and organizes facts into a base class Facts and several
sub classes that implement the necessary functionality.  The classes
are:
- Facts: base class.  Implements basic facts that should be common to a
  number of platforms.  It is also where SSH keys and SELinux facts are
  set.
- Hardware: A subclass of Facts that should be further
  subclassed per platform for CPU, memory, and related facts.
  - LinuxHardware: subclass of Hardware for Linux platforms
  - SunOSHardware: subclass of Hardware for SunOS platforms
  - FreeBSDHardware: subclass of Hardware for FreeBSD
- Network: A subclass of Facts that that should be further
  subclassed per platform for IP, both IPv4 and IPv6, information.
  - LinuxNetwork: Currently only implementation for determining network
    facts.
- Virtual: A subclass of Facts that that should be further
  subclassed per platform to determine virtual environment facts.
  - LinuxVirtual: Currently only implementation for determining virtual
    facts.

If facts are needed for additional platforms, one of the above classes
(eg Network) can be further subclassed and implement the necessary
functionality.

In addition, it fixes get_network_facts() to work on Fedora17.  That
broke due to changes to ifconfig output.
2012-07-19 23:50:12 -07:00
Michael DeHaan
a94ec130d2 Common module code upgrades 2012-07-17 23:09:57 -04:00
Michael DeHaan
9006d4557d Added code to allow insertion of boilerplate into modules to make them able to share lots of code, the result
should be a huge reduction of total ansible source, at a slight cost of difficulty in original module development.

We need to apply this now to all modules, but may need to have some exemptions to things like command, which should
subclass this module.
2012-07-17 22:34:52 -04:00
Peter Sankauskas
5e35cd6466 Pass through error message when repo not found 2012-07-19 15:48:13 -07:00
John Kleint
ae665c15b3 Service module outputting extra data.
The service module was printing stuff to stderr, returning two
JSON dicts, not using consistent 'failed' values, had dead code
and unused variables.  Added detection for the case when service
status returns 'xxx is dead and pid file exists' and made the
code a bit easier to read.
2012-07-19 13:15:09 -04:00
Michael DeHaan
1a88a3362f add noninteractive to debian module per #602 2012-07-16 20:18:58 -04:00
Seth Vidal
f6a09bc4c1 Squashed commit of the following:
commit ea14bbfb52587bf5b97b5577c0439b01cb0b4836
Merge: 82819a9 285aaf8
Author: Michael DeHaan <michael.dehaan@gmail.com>
Date:   Sun Jul 15 14:38:28 2012 -0400

    Merge branch 'devel' of https://github.com/skvidal/ansible into skvidal_mount

commit 285aaf836c
Merge: 634c117 32b6879
Author: Seth Vidal <skvidal@fedoraproject.org>
Date:   Mon Jul 16 12:42:21 2012 -0400

    Merge remote-tracking branch 'upstream/devel' into devel

    * upstream/devel: (52 commits)
      format fixes to make fetch more usable
      ...

commit 634c11748e
Author: Seth Vidal <skvidal@fedoraproject.org>
Date:   Thu Jul 12 01:16:00 2012 -0400

    fix a bunch of small bugs in mount module - test with bind and local mounts

commit fcfd73de71
Author: Seth Vidal <skvidal@fedoraproject.org>
Date:   Wed Jul 11 20:46:14 2012 -0400

    fix some obvious bugs pointed out by #ansible

commit 13c3080383
Author: Seth Vidal <skvidal@fedoraproject.org>
Date:   Wed Jul 11 19:35:34 2012 -0400

    mount/fstab editor
2012-07-15 14:38:40 -04:00
Michael DeHaan
64c51ade1e Change the way we do with_items to make them happen next to each other in runner, which eliminates the problem of with_items and vars_files sometimes not playing nice with each other.
(Also a fix for the user module error handling when the user
is not present at the time of the return.  This can only really be caused by multiple ansible executions).
2012-07-14 19:18:33 -04:00
Michael DeHaan
931f9f1a61 Setup module no longer saves to disk, as templates are mostly useful in playbooks and this allows lots of simplifications
around file pathing and removes occasional permissions conflicts depending on how things are used.
2012-07-14 11:59:12 -04:00
Mark Theunissen
f47cc1693d The MySQL modules 2012-07-13 17:07:23 -05:00
Jeremy Smitherman
e5a6627d10 Removed unused recurse option in file module. 2012-07-12 02:04:51 -04:00
Michael DeHaan
fd7e96d33e Merge pull request #578 from jeremysmitherman/boolean_parameters
Removed boolean parameter setting from user module.
2012-07-11 10:58:09 -07:00
Michael DeHaan
626e4cb003 Merge pull request #572 from goozbach/devel
fixes #569 apt module problems on old versions of apt-python
2012-07-11 10:53:29 -07:00
Jeremy Smitherman
ecacb67d31 Added yes/no to user options instead of False comparison for force and remove options for user module 2012-07-11 12:16:40 -04:00
Michael DeHaan
3f5c4772be Merge pull request #575 from jeremysmitherman/apt-force
Added cmd modifications to use a force-yes option for apt module
2012-07-11 07:16:40 -07:00
Michael DeHaan
949f8b8fc5 Merge pull request #571 from sfromm/group
Group module fixes
2012-07-11 05:27:56 -07:00
Jeremy Smitherman
a35a0f885e Added cmd modifications to use a force-yes option for apt module 2012-07-10 22:22:52 -04:00
Derek Carter
f38b9d1ca7 added filter for future warning 2012-07-10 19:50:08 -04:00
Stephen Fromm
ac3341cc12 Minor fix to user module to further streamline setting 'changed' flag 2012-07-10 16:37:07 -07:00
Derek Carter
e261d49acc fixes #569 apt module problems on old versions of apt-python (namely debian 5.0) 2012-07-10 19:28:14 -04:00
Stephen Fromm
3a5f2126a6 Fixes to group module for better error handling
Takes a lot of the fixes to the user module and applies them to the
group module: provide stdout/stderr in result if available and call
fail_json() if the attempted action fails.
2012-07-10 16:18:53 -07:00
Michael DeHaan
3235da074e Merge pull request #568 from sfromm/user
User modules fixes
2012-07-10 16:04:17 -07:00
Michael DeHaan
8bb41bc627 Merge pull request #566 from jeremysmitherman/service-no-pid
Added additional output to service status checker
2012-07-10 16:03:51 -07:00
Stephen Fromm
09f025b7a0 Fixes to user module for better error handling
The user module now returns the output, both stdout and stderr, from
useradd, usermod, and userdel.  This should help debug cases why one of
those commands fail.  In addition, the user module will now call
fail_json() when the attempted command failed so as to properly
communicate a failure in a playbook.
2012-07-10 15:55:39 -07:00
Seth Vidal
2f11350665 modify user module so that password is NEVER logged before the command runs 2012-07-10 17:13:51 -04:00
Jeremy Smitherman
7af3bdc89e Added additional output to service status checker 2012-07-10 16:13:39 -04:00
John Kleint
375a1eaf43 Use iterative MD5 hashing. 2012-07-09 13:27:47 -04:00
Dave Hatton
55694db7c3 switch to hashlib.md5 or md5 instead of OS md5 commands 2012-07-09 08:52:00 +01:00
Peter Sankauskas
fed1e9870c Assigning to boolean first 2012-07-06 18:05:15 -07:00
Peter Sankauskas
fced8cf6b0 Getting the apt module to accept and understand a 'install-recommends' parameter which allows running apt with --no-install-recommends 2012-07-06 12:12:04 -07:00
Dave Hatton
ecaa794f7f copy always returned change=true 2012-07-06 13:43:19 +01:00
Dave Hatton
9d85a55434 switch to shutil.copy rather than os.system(cp) 2012-07-04 12:26:25 +01:00
Dave Hatton
263fcab594 md5 allow copy if file is missing 2012-07-03 20:07:08 +01:00
Jeremy Smitherman
3003aa2d47 Added IndexError catch for copy module, IndexError is thrown if a destination file doesn't exist 2012-07-03 14:12:19 -04:00
Dave Hatton
d47de18b6c improve error trapping for md5 2012-07-03 12:44:37 +01:00
Brad Olson
be9ff7ff46 Fixes ansible/ansible#522, no longer creates comment in ~/.ssh/authorized_keys, does not create directory or file if state==absent. 2012-07-02 19:16:57 +00:00
Brad Olson
756df550f8 Fixes ansible/ansible#523. Removed 'with:' blocks so module works with Python 2.4 for CentOS 5 support, courtesy of mcodd/ansible@29af24b732. 2012-07-02 17:57:38 +00:00
Derek Carter
fc4ae3e270 remove UID/GID from output 2012-07-01 17:38:17 -04:00
Derek Carter
a548769792 removed print from debug code of file module 2012-06-29 21:38:31 -04:00
Derek Carter
82832021e8 file when UID or GID doesn't exist 2012-06-29 20:05:23 -04:00
Michael DeHaan
efac68b636 Remove the -D module debug flag, which no longer is functional due to sudo pty requirements, and replace with -v/--verbose.
This flag will show playbook output from non-failing commands.  -v is also added to /usr/bin/ansible, but not  yet used.

I also gutted some internals code dealing with 'invocations' which allowed the callback to know what module invoked
it.  This is not something 0.5 does or needed, so callbacks have been simplified.
2012-06-19 21:57:43 -04:00
Ludovic Claude
daf858648b Add basic support for Solaris 2012-06-26 19:49:26 +02:00
Ingo Gottwald
a42167ca73 Copy module: Extended error handling and fixed error messages 2012-06-25 20:45:05 +02:00
Ingo Gottwald
270266e920 Added to copy module: Error handling for missing permissions on the copy destination 2012-06-23 21:39:37 +02:00
Michael DeHaan
25083953fc Merge pull request #495 from nafeger/devel
make copy module implemented closer to other newer modules when returning results
2012-06-20 13:12:24 -07:00
Nathan A. Feger
26816b72ec attempt to make copy more idiomatic. 2012-06-20 14:17:15 -05:00
Ingo Gottwald
abe33a5881 Enhanced the service state recognition in the service module:
- Added Upstart support
- Added an initial unknown state
- Prevented state changes when the current state is not recognized
- Changed the keyword recognition to a safer method
2012-06-17 15:55:26 +02:00
Fred Alger
80f402aa9b Remove unused md5sum function from file module 2012-06-15 00:13:35 -04:00
Fred Alger
834f6a216d Make shell outs to md5sum work on FreeBSD and OS X
Tested with OS X local connection and Linux remote. The paths to the
md5sum and md5 commands are hardcoded to the most common location. This
will definitely fail if the commands are elsewhere, or if the md5
command doesn't support the -q 'quiet' option.
2012-06-15 00:04:01 -04:00
Stephen Fromm
4a6a3fd305 Conditionally import hashlib (issue #471)
Import hashlib if it is there, otherwise import md5.  Adds method
file_digest that wraps the logic on which module to invoke.
2012-06-14 07:18:46 -07:00
Michael DeHaan
7926ab5b95 Merge pull request #469 from nafeger/devel
Add support for older version of python-apt
2012-06-13 19:21:31 -07:00
Nathan A. Feger
1d553830f2 Add support for older version of python-apt 2012-06-13 13:57:47 -05:00
Stephen Fromm
9cf182c225 Add assemble module
This adds a module that concatenates (ie. assembles) a file from
fragments in a directory in alphabetical order.  It chains the file
module afterward to fix up ownership and permission.  This also adds
tests for the assemble module with fragments in assemble.d.
2012-06-11 23:09:54 -07:00
Michael DeHaan
9ff59090c2 capture possible chown stderr output 2012-05-31 22:19:05 -04:00
Michael DeHaan
5a8e61a610 Fix parsing error in file module when returning errors. 2012-05-31 22:14:33 -04:00
Michael DeHaan
4886b26ea9 Merge pull request #426 from dagwieers/facts
Add BIOS information and fix VMware detection (supports both IDE and SCSI)
2012-05-31 18:45:52 -07:00
Michael DeHaan
960e7c331c Merge pull request #433 from bradobro/authorized_key
Renamed module, fixed idempotency, removed debug param.
2012-05-30 13:59:13 -07:00
Brad Olson
ab55b1a412 Renamed module, fixed idempotency, removed debug param. 2012-05-30 16:41:38 -04:00