Commit graph

4175 commits

Author SHA1 Message Date
Daniel Hokka Zakrisson
1f8805d9e0 Add some tests for directory-based inventory 2013-03-01 23:34:14 +01:00
Daniel Hokka Zakrisson
f1eb195ff5 vars_loader should get the path to the inventory + vars_plugins 2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
ad08995989 Make inventory basedir for directory based inventory be the directory
This puts host_vars and group_vars inside of the directory, allowing you
to target a single inventory but still have access to the variables.
2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
d9c6b60b24 Allow inventory to be a directory containing other inventories 2013-03-01 23:22:52 +01:00
Daniel Hokka Zakrisson
647cd0141c Move all inventory script code into the script parser 2013-03-01 23:22:52 +01:00
Michael DeHaan
7749b34546 Merge branch 'new_branch_for_apt_squashed' of git://github.com/RaymiiOrg/ansible-1 into devel
Conflicts:
	library/apt
2013-03-01 17:13:42 -05:00
Michael DeHaan
a19a0ca91b Update documentation on complex args to new simpler format. 2013-03-01 17:08:36 -05:00
Michael DeHaan
fb26f059c5 Merge pull request #2232 from dhozac/module-args-dict
Allow specifying args directly to actions using module: syntax
2013-03-01 14:03:23 -08:00
Michael DeHaan
26826c3bde Merge pull request #2235 from marktheunissen/mysql-idempotent-explanation
Add mysql user documentation about idempotent playbooks
2013-03-01 13:45:55 -08:00
Michael DeHaan
e83819599a Merge pull request #2234 from akvadrako/nice-yaml-and-json
add to_nice_yaml|json filters
2013-03-01 13:45:07 -08:00
Michael DeHaan
38ab9b50c7 Merge branch 'setup_network2' of git://github.com/nigelm/ansible into devel 2013-03-01 16:25:25 -05:00
Michael DeHaan
c92bfb7234 Merge branch 'madcow2' of git://github.com/bcoca/ansible into devel 2013-03-01 16:23:41 -05:00
Michael DeHaan
ff32e404d5 Most people are better off doing looping inside the playbook versus
outside, and get confused about scope.  As a result simply this documentation
feature by not talking about it :)
2013-03-01 16:20:50 -05:00
Michael DeHaan
d90ec4e117 Merge pull request #2253 from jcftang/cowsay-osx
Cowsay on OSX macports
2013-03-01 09:50:24 -08:00
Jimmy Tang
81a34c2d1d Cowsay on OSX macports 2013-03-01 16:51:13 +00:00
Michael DeHaan
8099e4ac26 Merge pull request #2240 from dorfsmay/pullreq-fetch-doc
Doc that fetch returns ok when src not present.
2013-03-01 07:55:37 -08:00
Michael DeHaan
22d20b4994 Merge pull request #2244 from fdavis/virt_doc_fix
virt module doc fix
2013-03-01 07:55:05 -08:00
Michael DeHaan
273005a380 Merge pull request #2226 from skinp/openwrt_support
Adding support for OpenWrt
2013-03-01 07:50:54 -08:00
Michael DeHaan
d9d5970858 Merge pull request #2222 from sfromm/issue2114
Update various modules for check_mode
2013-03-01 07:50:16 -08:00
Michael DeHaan
f5ba0c61af Merge pull request #2248 from jpmens/iso8601
Add ISO8601 date/time format to setup
2013-03-01 05:16:34 -08:00
Jan-Piet Mens
00bd581945 Add ISO8601 date/time format to setup
Zulu time and one with microseconds, useful for timestamping
  Add TZ
2013-03-01 09:40:40 +01:00
fdavis
427b49c12c virt module doc fix 2013-02-28 18:04:25 -08:00
Michael DeHaan
bd9c64e014 Merge pull request #2245 from jmandel/add_user_fact
Add remote user_id to ansible facts
2013-02-28 16:14:54 -08:00
Josh Mandel
7c772c6af5 Add remote user_id to ansible facts 2013-02-28 15:55:31 -08:00
Michael DeHaan
b5ad1ce768 In django module if no virtualenv is specified, don't choke 2013-02-28 16:03:23 -05:00
Michael DeHaan
1e5d5fc263 Be consistent about underscore usage. 2013-02-28 15:57:27 -05:00
Michael DeHaan
60da7591c2 Merge pull request #2241 from tonk/devel
Added dat and time facts to setup
2013-02-28 12:43:26 -08:00
Ton Kersten
7b51f67128 Squashed commit of the following:
commit 076501459322cf6c14de742e504339d80ffdeed5
Author: Ton Kersten <tonk@tonkersten.com>
Date:   Thu Feb 28 21:32:57 2013 +0100

    Added date and time facts to setup
2013-02-28 21:33:56 +01:00
Yves Dorfsman
7cedb7d432 Doc that fetch returns ok when src not present. 2013-02-28 13:24:24 -07:00
Michael DeHaan
fab3a522e2 Merge pull request #2239 from marktheunissen/nolog-mysql
Fix bug from copy-paste
2013-02-28 12:07:42 -08:00
Mark Theunissen
34bed2fa2e Fix bug from copy-paste 2013-02-28 13:55:22 -06:00
Remy van Elst
f094d65fdd apt update 2013-02-28 20:50:07 +01:00
Remy van Elst
5289fa72b6 apt upgrade support 2013-02-28 20:47:31 +01:00
Mark Theunissen
45949c7643 Add mysql user documentation 2013-02-28 10:25:09 -06:00
Devin Bayer
fca1167a0e add to_nice_yaml|json filters 2013-02-28 17:07:02 +01:00
Daniel Hokka Zakrisson
ae8d6ac303 Ensure complex_args is considered in all action_plugins 2013-02-28 14:27:42 +01:00
Daniel Hokka Zakrisson
297259725a Allow (local_)action: to be a dict
Use the key module: to set which module to invoke.
2013-02-28 14:12:36 +01:00
Daniel Hokka Zakrisson
52c9a7af24 Fix references to user.username to be user.name 2013-02-28 14:02:59 +01:00
Daniel Hokka Zakrisson
c04d5ba739 Allow specifying args directly to actions using module: syntax
Makes things like
- name: do complex things with complex module
  complex:
    setting_a: true
    setting_b:
    - foo
    - bar
possible.

Fixes #2228.
2013-02-28 13:54:04 +01:00
Daniel Hokka Zakrisson
4807fbc8b7 Use regular strings to allow tests to work 2013-02-28 13:52:57 +01:00
Michael DeHaan
6c9bb35f89 Merge pull request #2231 from tonk/devel
Service command handling fix when no upstart config file
2013-02-28 04:44:43 -08:00
Ton Kersten
05c70ca712 Squashed commit of the following:
commit e057ea671395ec8847f920a63cf9524f5c8fde5f
Author: Ton Kersten <tonk@tonkersten.com>
Date:   Thu Feb 28 13:02:25 2013 +0100

    Fixed the service command not working

    On Ubuntu 1[02].04 the service name was not recognized because
    there is a SysV style init script, but not an upstart config file.

    Example: The `ntp` client.

    Also removed extra spaces at the end of the lines, while at it.
2013-02-28 13:06:50 +01:00
Nigel Metheringham
e2643cb55f Broke BSD ifconfig parser into chunks for subclassing
This allows minor changes to be handled by adding a new
parse line function to the subclass
2013-02-28 09:58:29 +00:00
Nigel Metheringham
acc1c004d4 Restructured inheritance of BSD network classes
Now all BSD network classes directly inherit from Network as well as from the generic BSD network class.  This removes the need for itersubclasses().
2013-02-28 09:07:54 +00:00
Patrick Pelletier
2778ee0eb5 Adding support for OpenWrt 2013-02-27 22:16:12 -05:00
Michael DeHaan
23bcb64758 Merge pull request #2224 from cliffano/patch-1
Fix proxy env format
2013-02-27 15:40:34 -08:00
Cliffano Subagio
19082f7b20 Fix proxy env format
The incorrect format (e.g. http_proxy=http://proxy.bos.example.com:8080) gave this error: "environment must be a dictionary".
2013-02-28 10:39:08 +11:00
Michael DeHaan
323ed27106 Merge pull request #2221 from sfromm/fix-ansible-cli-check-mode
Fix CliRunnerCallbacks.on_file_diff in callbacks.py
2013-02-27 15:34:05 -08:00
Stephen Fromm
fa07604d43 Fix CliRunnerCallbacks.on_file_diff in callbacks.py
When running ansible -C, I get a traceback that ends with
    AttributeError: Values instance has no attribute 'diff'
This fixes on_file_diff to behave similar to
PlaybookRunnerCallbacks.on_file_diff().
2013-02-27 13:26:29 -08:00
Stephen Fromm
8f0d8a8546 Update various modules for check_mode
This updates the following modules to support check_mode:
* apt_key
* apt_repository
* easy_install
* pip - will always report changed due to the way it handles state
* seboolean
* selinux
* slurp - since nothing changes, it just adds that it supports
  check_mode
* subversion - reports changed when checking out new repo and
  when updating.
* supervisorctl
* svr4pkg

See issue #2114.
2013-02-27 12:23:35 -08:00