Commit graph

904 commits

Author SHA1 Message Date
Stephen Fromm
1bcfdd94f3 Further refine remote branch tracking in b1ec6e8
Move operations that are dependant on a remote branch under a if
is_remote_branch() conditional.  While at it, remove assignment to cmd
string in same block that wasn't used when calling _run().
2012-12-04 17:02:54 -08:00
Stephen Fromm
b1ec6e8163 Fix git module to update branch to latest when using version=<branch>
The git module would not pull in updates to a branch when
version=<branch>.  This updates that block to checkout the branch
and then do a git reset --hard <remote>/<branch>.  This
should now track updates to a branch.
2012-12-04 11:40:48 -08:00
Piotr Kweclich
9c20eb089b added support for scheduling downtime for all services on host 2012-12-03 22:40:27 +01:00
Stephen Fromm
5b7c8fcc38 Further tweak how to find pip in virtualenv on centos/redhat/fedora
In a virtualenv, pip is called just pip.  This fixes the pip module to
search for the virtualenv pip first before trying the pip-python and
python-pip variants.  Without this, pip module would not install to the
virtualenv when that parameter is provided.
2012-12-02 08:13:10 -08:00
Stephen Fromm
e33e02950d Make use of mirrors in pip module configurable with use_mirrors option
Older versions of pip (anything less than 1.0?) do not support
--use-mirrors flag.  This makes it configurable.  Default is yes.
2012-12-02 08:04:27 -08:00
Daniel Hokka Zakrisson
d5a456fbcf Merge pull request #1697 from bcoca/mint
Implements multiple interpreter overrides
2012-12-02 05:28:28 -08:00
Stephen Fromm
d277953a53 Fix pip module to check if requirements already installed
This updates _is_package_installed() to accept a requirements file
as an argument.  This is used later in main() to check if python libs
specified in a requirements file are already installed.  I updated
main() to consolidate the handling of install/uninstall in a single
block.  This should help if someone wants to remove packages specified
by a requirements file.
2012-12-01 20:00:21 -08:00
Igor Galić
1ba5c5ae97 : doesn't work in this documentation. 2012-11-28 10:36:22 +01:00
Igor Galić
e031054934 Fix subversion module's documentation
Let our users determine what they want to do with a given module.
Particularily when the mdoule doesn't pose any such restrictions.
2012-11-28 10:02:20 +01:00
Brian Coca
8ef2807305 removed env as per project policy
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2012-11-27 11:18:46 -05:00
Jan-Piet Mens
910f1c042e ini_file: prohibit section name 'default'
allow update of default section
add blurb re template to create base file
2012-11-27 13:21:48 +01:00
Patrik Lundin
d4af9e4c5c Use shlex for rc.conf parsing.
This makes the line parsing a lot more robust (and easier to read).
Code supplied by @dhozac, thanks!

Remove re import because this is not used anywhere.
2012-11-25 13:09:54 +01:00
Patrik Lundin
fde00327b0 Rework "enabled" implementation for FreeBSD.
When trying to perform enabled=yes followed by enabled=no
against FreeBSD the module would die with the following error:
TypeError: sub() takes at most 4 arguments (5 given)

The target FreeBSD client (8.2) is running python 2.6.6. It seems the
extra 'flags' argument was added to re.sub() in 2.7.

In fixing this issue I have attempted to create a general atomic method
for modifying a rc.conf file. Hopefully this will make it easier to add
other rc based platorms. The strip/split magic was inspired by the user
module.
2012-11-25 13:09:54 +01:00
Daniel Hokka Zakrisson
4679d8d6e5 Remove references to non-existant variable rc 2012-11-25 00:23:29 +01:00
Daniel Hokka Zakrisson
1ec2a59073 Merge pull request #1676 from dagwieers/service-action-fix
The vars stop/start were intended as strings
2012-11-24 15:16:30 -08:00
Dag Wieers
18b797f096 The vars stop/start were intended as strings
This is a typo that was reported on IRC, because of this people got: "NameError: global name 'stop' is not defined".
2012-11-25 00:13:53 +01:00
Ton Kersten
7bba04b176 Corrected for fallthrough 2012-11-24 16:26:15 +01:00
Ton Kersten
ee4fe9ff55 Added pip-python to the search for CentOS 6 compatibility 2012-11-24 13:36:32 +01:00
Michael DeHaan
ac09b47ec4 Merge pull request #1668 from eest/refactor_service_module
Repost: Refactor service module to use subclasses like user module.
2012-11-23 13:19:09 -08:00
Patrik Lundin
5b7aa494b2 Refactor module to use subclasses like user module.
* Basically the moving parts from the original service module arranged in
  subclasses.
* General structure and helper methods comes from the user module.
* Less forgiving to unsupported platforms: it requires a subclass per platform.
  (This makes it easier to work on one platform without having to think about.
  what other platform might be affected in unexpected ways).
* Now has basic OpenBSD support.
* Solaris support needs to be added.

Thanks to @dhozac for general advice and Linux testing.
Thanks to @bcoca for clearing up some FreeBSD questions.
2012-11-23 21:03:17 +01:00
Michael DeHaan
ce487a8544 Merge pull request #1658 from jpmens/docs_2
module_formatter: re-instate code
2012-11-23 07:58:48 -08:00
Michael DeHaan
3981c72957 Streamline code 2012-11-23 10:58:17 -05:00
Michael DeHaan
17020d6a75 Merge pull request #1656 from dagwieers/setup-virtualization
Implemented more virtualization types
2012-11-23 07:55:42 -08:00
Jan-Piet Mens
3b83295581 DOCUMENTATION: yum (moved version to added) 2012-11-22 15:16:20 +01:00
Jan-Piet Mens
068ef0e979 module_formatter: re-instate code 2012-11-22 07:23:10 +01:00
Dag Wieers
e528826dba Implemented more virtualization types
I added all known virtualization types from the virt-what project. However, the few virt types that rely on cpuid information have not been implemented lacking native python cpuid access. (hyperv)
2012-11-22 02:48:13 +01:00
Jan-Piet Mens
caf003c813 DOCUMENTATION strings 2012-11-21 18:49:30 +01:00
Dag Wieers
118ccc68c9 Make the default an empty string
Seems a bit strange I have to set a default in two locations.
2012-11-21 16:11:20 +01:00
Michael DeHaan
663a8fef3f chmod -x for all module files in source checkout 2012-11-19 13:47:40 -05:00
Daniel Hokka Zakrisson
b95bcf1b9d Use single-quotes to contain SSH keys as they may contain double-quotes
Fixes #1624.
2012-11-18 18:31:57 +01:00
Michael DeHaan
99a0ebcad0 Merge pull request #1642 from dagwieers/service-options
Allow adding additional arguments to service module
2012-11-17 16:58:37 -08:00
Dag Wieers
3852b9918a Allow adding additional arguments to service module
Some services allow additional arguments to be provided on the command line. This patch makes it possible.
2012-11-18 01:48:06 +01:00
Michael DeHaan
bb2e5e12b8 Merge pull request #1638 from jpmens/ec2_userdata
Support for user_data in ec2 module
2012-11-17 07:43:35 -08:00
Michael DeHaan
c9aef42ac4 Merge pull request #1636 from romeotheriault/add-sunos-subclass-to-group-mod
Add sunos subclass to group mod
2012-11-17 07:39:17 -08:00
Michael DeHaan
e13d67bbf1 Merge pull request #1635 from romeotheriault/classify-group-module
convert group module to be platform sub-classable
2012-11-17 07:38:32 -08:00
Jan-Piet Mens
e4606d500c Support for user_data in ec2 module
fix
2012-11-17 16:12:46 +01:00
Romeo Theriault
bb976ddfe0 add solaris subclass to group module 2012-11-16 16:05:16 -10:00
Romeo Theriault
a52faa841f convert group module to be platform sub-classable 2012-11-16 15:38:13 -10:00
Fabian Arrotin
269a0779b4 Added a requirement on euca2ools external package and ec2 url example 2012-11-16 20:47:39 +01:00
Michael DeHaan
0ab3bd0034 Fix for #1577 (python 2.4 compliance for mysql_user), tested only for syntax, please exercise MySQL fans! 2012-11-14 20:02:39 -05:00
Michael DeHaan
096607eea4 Allow fireball to transfer binary files, fixup fireball docs, make fetch work with fireball. 2012-11-14 18:37:17 -05:00
Michael DeHaan
613539810e Missing import 2012-11-14 18:19:16 -05:00
Romeo Theriault
ae36fb1dc6 minor linux user module fixups 2012-11-12 11:13:51 -10:00
Michael DeHaan
001e2e564f Merge pull request #1590 from romeotheriault/minor-freebsd-user-module-fixes
minor freebsd user fixes
2012-11-10 06:33:13 -08:00
Michael DeHaan
80f196fdbc Merge pull request #1589 from romeotheriault/add-sunos-user-support
Add solaris support to user module
2012-11-10 06:32:41 -08:00
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