Commit graph

859 commits

Author SHA1 Message Date
Romeo Theriault
6c6bcff4ee minor freebsd user fixes 2012-11-09 22:29:45 -10:00
Romeo Theriault
3bab27abdb Add solaris support to user module 2012-11-09 21:58:51 -10:00
Jan-Piet Mens
e32f4a0564 Move get_docstring from module_formatter into ansible/utils 2012-11-09 17:15:41 +01:00
Yvan Cottyn
e9a356bbde Fix exception catching for Python 2.4 2012-11-09 14:28:21 +01:00
Yvan Cottyn
37de471ab6 Fix exception catching for Python 2.4 2012-11-09 14:27:03 +01:00
Michael DeHaan
09cde86e83 Merge pull request #1571 from skvidal/ec2
add ec2 module
2012-11-09 04:53:03 -08:00
Seth Vidal
e147ad4213 add add_host action plugin - add hosts to inventory during a playbook
run - lets act on those hosts in the next play
2012-11-09 00:16:17 -05:00
Seth Vidal
7e0cb4f052 add ec2 module 2012-11-09 00:15:12 -05:00
Dag Wieers
2fdb217be3 Documentation of svr4pkg module breaks 'make rpm'
Without this fix, generating documentation results in:

```
Traceback (most recent call last):
  File "hacking/module_formatter.py", line 376, in <module>
    main()
  File "hacking/module_formatter.py", line 365, in main
    text = template.render(doc)
  File "/usr/lib64/python2.6/site-packages/jinja2/environment.py", line 669, in render
    return self.environment.handle_exception(exc_info, True)
  File "hacking/templates/man.j2", line 20, in top-level template code
    {% for desc in v.description %}@{ desc | jpfunc }@{% endfor %}
  File "hacking/module_formatter.py", line 94, in man_ify
    t = _ITALIC.sub(r'\\fI' + r"\1" + r"\\fR", text)
TypeError: expected string or buffer
```
2012-11-09 02:22:20 +01:00
Michael DeHaan
03591e0fc8 Merge pull request #1551 from dagwieers/local_action-fail
Turn 'fail' and 'debug' modules into action_plugins
2012-11-08 16:47:24 -08:00
Michael DeHaan
f3cbcecf53 Merge pull request #1563 from lllama/devel
Add an "executable" option to the command and shell modules
2012-11-08 16:45:48 -08:00
Michael DeHaan
03f4b0f923 Merge pull request #1560 from dagwieers/module-output-consistency
Make module output more consistent wrt. changed/failed
2012-11-08 16:45:05 -08:00
Michael DeHaan
cbff02139f Merge pull request #1557 from sfromm/issue1412
Updates to git module: use git-fetch and other changes
2012-11-08 16:44:00 -08:00
Michael DeHaan
42375d14b3 Merge pull request #1556 from sfromm/issue1099
Wrap getpwnam in try/except in authorized_key module
2012-11-08 16:43:45 -08:00
Boyd Adamson
528a457848 Add svr4pkg module for traditional Solaris packages 2012-11-09 09:43:19 +11:00
Felix Ingram
e0f0e8c023 Add an "executable" option to the command and shell modules
The option will be passed to the Popen object created and will be used to
execute the command instead of the default shell.
2012-11-08 13:56:16 +00:00
Dag Wieers
fe0c70fe9d Make module output more consistent wrt. changed/failed
- Make sure exit_json() always returns a changed= value
- Modify the yum module to not return failed=False
- Modify install() and latest() similar to remove() in yum module
- Changed exit_json(failed=True, **res) into a fail_json(**res)
- Make sure yum rc= value reflects loop (similar to how we fixed remove())
2012-11-08 12:28:18 +01:00
Stephen Fromm
3ec64d19a8 Wrap getpwnam in try/except in authorized_key module
This also adds module as an argument to keyfile().
2012-11-07 16:43:09 -08:00
Stephen Fromm
6aa51a7cf3 Rewrite switch_version() to detect branch
Rewrote switch_version() to read .git/HEAD to find branch associated
with HEAD.  If in a detached HEAD state, will read
.git/refs/remotes/<remote>/HEAD.
2012-11-07 16:33:22 -08:00
Dag Wieers
d8459425a0 Turn 'fail' and 'debug' modules into action_plugins
This makes more sense as there is no purpose in running these remotely.
2012-11-07 23:34:53 +01:00
Michael DeHaan
612aed55bb Merge pull request #1546 from dagwieers/get_url-nonthirsty-fix
Don't require thirsty mode for directory destination
2012-11-07 13:51:38 -08:00
Stephen Fromm
49d41da152 Use supplied remote name when cloning git repository 2012-11-07 12:15:22 -08:00
Stephen Fromm
328951ef53 Checkout branch before rebase in switch_version 2012-11-07 11:44:48 -08:00
Stephen Fromm
ccc04cf891 More work in git module
Rename pull() to fetch().  It does a git fetch and then a
git fetch --tags.
Add _run() method to handle all subprocess.Popen calls.  Change
all previous calls to subprocess.Popen to use _run().
2012-11-07 11:44:48 -08:00
Brian Coca
5ea260f44b fix case in which file is created and backup is requested but fails, not it just doesn't attempt to backup the missing file
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2012-11-07 10:33:43 -05:00
Dag Wieers
82ec405b05 Don't require thirsty mode for directory destination
There is no need to require thirsty mode when the destination is a directory. We add the basename of the url to the destination directory and proceed with that. If that file exists in non-thirsty mode continue as expected.

I also cleaned up some of the logic that is no longer necessary if we simply rewrite the destination from the very start the way it is expected.
2012-11-07 14:16:48 +01:00
Fabian Arrotin
29882f97e6 Fixed the way dom0/domU xen role is defined in the setup module 2012-11-06 22:49:33 +01:00
Stephen Fromm
2fab846f17 Fix to user module to use self when calling group_exists 2012-11-06 09:05:25 -08:00
Daniel Hokka Zakrisson
cf290a0064 Keep fireball from spreading its socket around 2012-11-06 15:10:34 +01:00
Nigel Metheringham
f905e751ac FreeBSD user mod only fires when there are changes
Also fix missing -G on groups change
2012-11-04 12:09:19 +00:00
Nigel Metheringham
1ab1c8d374 Take SHADOWFILE from existing user object rather than class 2012-11-04 09:54:50 +00:00
Nigel Metheringham
75a2b2ba2d Use the existing framework when running ssh_keygen 2012-11-04 09:47:30 +00:00
Nigel Metheringham
19402a47cd Ensure user owns their ssh key directory on creation
Lost section from commit 8049777
2012-11-04 09:44:38 +00:00
Michael DeHaan
6f938c9f4c Merge branch 'playbook_ssh_ask_pass' of git://github.com/clatour/ansible into devel
Conflicts:
	examples/ansible.cfg

+ doc tweak
2012-11-03 19:23:38 -04:00
Michael DeHaan
d639844923 Merge branch 'service_bsd' of git://github.com/bcoca/ansible into devel 2012-11-03 18:58:29 -04:00
Michael DeHaan
970d06e03b Fix user example 2012-11-03 18:57:19 -04:00
Michael DeHaan
626203a7c9 Module documentation should have options sorted 2012-11-03 18:52:59 -04:00
Michael DeHaan
c96f2c968e Merge branch 'nigelm_freebsd' of git://github.com/nigelm/ansible into merge-service
Make things more reusable, correct some errors along the SSH key path

Conflicts:
	library/user
2012-11-03 18:38:05 -04:00
Nigel Metheringham
cdfa81d905 Added some documentation to the classes 2012-11-01 19:16:54 +00:00
Daniel Hokka Zakrisson
20775c0b73 Fix service module for varnish initscript in EPEL
It outputs 'dead but pid file exists'.
2012-10-31 12:31:08 +01:00
Brian Coca
13f75e5a8e Now can handle rc.conf and init.d/rc.d based systems
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2012-10-30 23:34:18 -04:00
Dag Wieers
9268aa0289 Use return codes > 255 for Ansible-specific errors.
I had made and pushed this change after you already pulled the request.

@dhozac indicated that it would probably be better to use return codes > 255 for anything related to Ansible itself. Which makes sens :)
2012-10-30 23:34:18 -04:00
Michael DeHaan
c0747b7baa pep8 fixes 2012-10-30 20:42:07 -04:00
Michael DeHaan
27e518a0b1 Rename 'domainname' to 'domain' 2012-10-30 20:07:36 -04:00
Michael DeHaan
9251709941 Merge pull request #1490 from sfromm/issue1484
Make sure ownership is set correctly for user's new ssh keys
2012-10-30 17:03:07 -07:00
Michael DeHaan
768d293949 Merge pull request #1488 from dagwieers/lineinfile-create
Add option create= to lineinfile module
2012-10-30 17:02:00 -07:00
Michael DeHaan
91cf257e9c Merge pull request #1487 from skvidal/devel
fix up remove and fix fixme checking to see if pkg was removed
2012-10-30 17:00:54 -07:00
Michael DeHaan
0853ece810 Merge pull request #1474 from jhoekx/group-by-plugin-template
Add a group_by action plugin.
2012-10-30 16:54:07 -07:00
Serge van Ginderachter
1db563e064 Add domainname to ansible facts 2012-10-30 19:47:31 -04:00
Serge van Ginderachter
47d882f374 Fix typo 2012-10-30 19:43:22 +01:00
Dag Wieers
1e3dcfce4b Add option create= to lineinfile module
We use the lineinfile module to modify configuration files of a proprietary application. This application reads configuration options from files, but does not require those files to exist (if the default options are fine). However this application may modify the configuration file at will, so we cannot copy or template those files. And after a silent install the configuration may not exist (depending on the response file).

Whatever the case, during deployment we need to make sure some configuration options are set after the installation.

So the cleanest way to handle this situation is to allow the lineinfile module to create the file if it is missing (and this is the expected behavior). When I proposed this behavior, @sergevanginderachter needed the same functionality and was now working around it as well.
2012-10-30 17:57:15 +01:00
Stephen Fromm
4619e99443 Make sure ownership is set correctly for user's new ssh keys 2012-10-30 09:37:23 -07:00
Michael DeHaan
f0000a89b0 Merge pull request #1480 from dagwieers/command-fix2
Use return codes > 255 for Ansible-specific errors.
2012-10-30 05:04:44 -07:00
Michael DeHaan
730031ec1f Merge pull request #1479 from wzzrd/selinux
More useful error message for if not HAVE_SELINUX
2012-10-30 05:04:28 -07:00
Dag Wieers
8d4f9febd8 Use return codes > 255 for Ansible-specific errors.
I had made and pushed this change after you already pulled the request.

@dhozac indicated that it would probably be better to use return codes > 255 for anything related to Ansible itself. Which makes sens :)
2012-10-30 10:36:11 +01:00
Seth Vidal
49dce05cdd fix up remove and fix fixme checking to see if pkg was removed 2012-10-29 23:48:21 -04:00
Nigel Metheringham
9a2545957f Turn off some of the additional debug syslogging 2012-10-29 22:04:06 +00:00
Nigel Metheringham
3e0e572cce Rework of user module to support portability
Split module into a main calling function, and a generic
(Linux useradd/usermod/userdel) User class.
Added a __new__ function that selects most appropriate superclass
Added a FreeBSD User class
Tested against FreeBSD 9.0
2012-10-29 22:00:58 +00:00
Seth Vidal
7c1e0de141 fix removal case where first pkg in a list is not installed at all
and the next one gets ignored despite being installed.

also clean up unnecessary second check.
2012-10-29 13:48:20 -04:00
Maxim Burgerhout
82cc382c6a More useful error message for if not HAVE_SELINUX 2012-10-29 16:23:00 +01:00
Jeroen Hoekx
b336d40101 Add a group_by action plugin. 2012-10-29 13:10:23 +01:00
Dag Wieers
63fa33b0b7 Make sure we always return 'rc' from the command module
If this is not a certainty, playbooks will fail without an 'rc' and checking both if there is an rc, and whether the 'rc' is (not) 0 is very complicated. (especially because ${something.rc} will not be substituted and all that)
2012-10-26 15:02:03 +02:00
Daniel Hokka Zakrisson
7a8009f979 When atomically replacing files, copy attributes 2012-10-25 21:40:05 -04:00
Michael DeHaan
523f2bf327 Merge pull request #1455 from bleader/devel
user module: fix typo in documentation
2012-10-25 18:26:58 -07:00
Michael DeHaan
cbcc133cdd Merge pull request #1453 from sfromm/issue1211
Use shutil.copyfile so as to preserve file ownership in authorized_keys
2012-10-25 18:22:56 -07:00
Michael DeHaan
5b36e374d7 Merge pull request #1451 from dhozac/command-strip-newlines
Only strip trailing newlines from output, preserving other space
2012-10-25 18:21:16 -07:00
Michael DeHaan
06fa3e820d Merge pull request #1448 from jpmens/user_user1
User is alias for name in 'user' module
2012-10-25 18:18:56 -07:00
bleader
5a5751d1d0 user module: fix typo in documentation
tyep -> type

Signed-off-by: bleader <bleader@ratonland.org>
2012-10-25 20:56:13 +02:00
Stephen Fromm
a033ad4d74 Use shutil.copyfile so as to preserve file ownership in authorized_keys 2012-10-25 11:20:53 -07:00
Daniel Hokka Zakrisson
73cd3ef617 Only strip trailing newlines from output, preserving other space 2012-10-25 14:26:37 +02:00
Jan-Piet Mens
89f28a98dd User is alias for name in 'user' module 2012-10-25 14:03:13 +02:00
Michael DeHaan
895715b65b Merge pull request #1445 from sfromm/issue1439
Skip check of primary group when checking other group membership
2012-10-25 03:58:17 -07:00
Stephen Fromm
544dc76704 Create temp file in directory where ssh key lives 2012-10-24 20:50:11 -07:00
Stephen Fromm
b2e94e53fc Write keys file to temp location to avoid potential corruption 2012-10-24 20:47:45 -07:00
Stephen Fromm
e97916cfc1 Skip check of primary group when checking other group membership 2012-10-24 20:39:42 -07:00
Michael DeHaan
f2a7ca9a36 Merge pull request #1435 from stijnopheide/mysql-grant
Mysql grant, take 2
2012-10-24 18:18:13 -07:00
Michael DeHaan
3e491513a9 Merge pull request #1432 from skvidal/devel
yum enablerepo/disablerepo option complete
2012-10-24 17:13:29 -07:00
Dag Wieers
f4c4537327 Resolve traceback when python-selinux is not installed 2012-10-24 18:57:24 +02:00
Seth Vidal
0a153c6798 add comments that enablerepo/disablerepo are new in 0.9 2012-10-24 09:08:42 -04:00
Stijn Opheide
733693ffdc - removed space escapes from MySQL SHOW GRANTS regex
- proper checking for with grant option (if this is not the only option the user has)
- added revoking of grant option
2012-10-24 15:02:54 +02:00
Stijn Opheide
6b92b69fe6 added the GRANT privilege for a mysql user (WITH GRANT OPTION) 2012-10-24 15:02:54 +02:00
Jan-Piet Mens
82955606c4 fix DOCUMENTATION for user 2012-10-24 07:35:56 +02:00
Seth Vidal
d8337dab06 tested and verified yum enable/disablerepo option for yum module 2012-10-24 00:46:15 -04:00
Seth Vidal
d89d07550f first cut at yum module with enable/disable repo 2012-10-24 00:24:40 -04:00
Michael DeHaan
9626111d5b Merge pull request #1427 from bleader/devel
mount: update example with mandatory option
2012-10-23 21:02:46 -07:00
Stephen Fromm
5d8c130a7f Document ssh_key options are in version 0.9 2012-10-23 08:21:40 -07:00
bleader
e16e3fb4ca mount: update example with mandatory option
- 'state' is required, but wasn't in example

Signed-off-by: bleader <bleader@ratonland.org>
2012-10-23 15:49:47 +02:00
Jan-Piet Mens
feab57e270 Reformat code: examples consistently
- added terse syntax to modules.rst
 - added description of special variables to template module
2012-10-23 15:14:01 +02:00
Stephen Fromm
769bd9125a Help git module work when working in 'no branch' scenario
Detect when on a 'no branch' branch.  If so, checkout the HEAD branch
as reported by 'git remote show <remote>'.  That should put the repo
back on a branch such that git can then merge changes as necessary.
In addition, removed hard-coded references to origin and replaced
with remote var.
2012-10-22 16:03:35 -07:00
Michael DeHaan
cbc12f0dba Various performance streamlining and making the file features usable in all modules without daisy chaining. 2012-10-20 22:55:09 -04:00
Michael DeHaan
4104478abd Added 'script', a module that can push and insantly run a remote script. Replaces the need to copy+command.
This is a bit of a rough draft, some error handling still needs to be added.
2012-10-20 12:12:07 -04:00
Michael DeHaan
6b8448051f Merge pull request #1389 from sfromm/issue1214
Add ability to create SSH key for user in user module
2012-10-20 07:30:24 -07:00
Michael DeHaan
3c739b1a88 Merge pull request #1339 from inertialbit/add-basic-pg-role-attribute-support
add role_attr_flags parameter to postgresql_user
2012-10-20 07:29:26 -07:00
Stephen Fromm
87954f2110 Use os.path.join where appropriate 2012-10-19 22:22:27 -07:00
Stephen Fromm
63ba441163 Add ability to create SSH key for user in user module
This allows one to create a SSH key for user.  You may define:
ssh_key_type, ssh_key_bits, ssh_key_file, ssh_key_comment,
and ssh_key_passphrase.  If no passphrase is provided, the
key will be passphrase-less.  This will not overwrite an existing key.
In the JSON returned, it will provide the ssh_fingerprint and
ssh_key_file.
2012-10-19 22:00:31 -07:00
Michael DeHaan
68cf9a96fc Merge pull request #1388 from goozbach/selinux_bugs
make policy only be required if state is not disabled
2012-10-19 16:35:15 -07:00
Derek Carter
99180e7da3 make policy only be required if state is not disabled 2012-10-19 17:17:30 -04:00
Seth Vidal
326b160241 when a pkg is installed, but not from any repo, don't error out
that it is not installed.

Also when a pkg is both installed and in a repo do not look it up
more than once
2012-10-19 16:28:39 -04:00
Michael DeHaan
d58bc4da4e Merge pull request #1361 from lantins/devel
Copy module can replace symlink with a real file.
2012-10-18 16:59:45 -07:00
Michael DeHaan
05866bba1e Merge pull request #1372 from jpmens/rst_template1
module_formatter: .rst now correctly handles code examples
2012-10-18 16:58:08 -07:00