Commit graph

1838 commits

Author SHA1 Message Date
Michael DeHaan
d9c0a5c37d Revert "now modules can implement with_items list globbing w/o updating"
This reverts commit 4942a06bc2.

Conflicts:

	lib/ansible/runner/__init__.py
2013-06-19 19:00:18 -04:00
Michael DeHaan
0bd92d8196 Merge pull request #3262 from j2sol/add-host-name
make name the parameter, with hostname as alias
2013-06-19 08:33:12 -07:00
Michael DeHaan
5b1babbdc0 Merge pull request #3260 from lorin/migrate-noinput
django_manage: Pass --noinput to migrate
2013-06-19 08:31:19 -07:00
Michael DeHaan
d0a4f2d1e4 Merge pull request #3264 from arturaz/devel
datadog_event module requires urllib2, not httplib2.
2013-06-19 08:27:13 -07:00
Arturas Slajus
0ea0a2c6d7 datadog_event module requires urllib2, not httplib2. 2013-06-19 11:17:05 +03:00
Jesse Keating
1074896105 make name the parameter, with hostname as alias
name is used throughout Ansible, it's the "standard". This change
applies that standard to the add_host routine and updates the docs to
reflect that. Related to https://github.com/ansible/ansible/pull/3254
2013-06-18 21:11:52 -07:00
Lorin Hochstein
1ef1b03bf6 django_manage: Pass --noinput to migrate
The django 'migrate' command should receive the --noinput command,
otherwise it can block waiting for user input.
2013-06-18 23:05:40 -04:00
Michael DeHaan
575e052c6c Merge pull request #3147 from toshywoshy/setup_mtab_without_bind
changed get_mount_facts to ignore mount types 'none'
2013-06-18 17:56:49 -07:00
Michael DeHaan
1e3ab98a13 Merge pull request #3219 from arturaz/devel
datadog_event module: submit your events to DataDog service.
2013-06-18 17:31:52 -07:00
Michael DeHaan
dd7f7d5593 Merge branch 'file_hard' of git://github.com/bcoca/ansible into devel
Conflicts:
	library/files/file
2013-06-18 20:31:05 -04:00
Michael DeHaan
61ac8d03af Clarify module docs 2013-06-18 20:19:29 -04:00
Michael DeHaan
31b63b033b Merge conflict 2013-06-18 20:18:17 -04:00
Michael DeHaan
96134d003e Merge remote branch 'origin/devel' into devel 2013-06-18 20:17:31 -04:00
Michael DeHaan
51ba3d8c3d Merge pull request #3230 from sayap/openrc
Add OpenRC support to the service module.
2013-06-18 17:13:06 -07:00
Michael DeHaan
273f37b394 Merge pull request #3255 from jlund/sha256-example-cleanup
Removed merge conflict header
2013-06-18 17:08:59 -07:00
Michael DeHaan
2f1420f071 Merge pull request #3258 from j2sol/apt-doc
pkg option of apt is not required
2013-06-18 16:56:35 -07:00
Jesse Keating
86bc2ec08a pkg option of apt is not required
You can use apt module with update_cache and without specifying a
package. Update the docs to reflect this.
2013-06-18 16:25:46 -07:00
Joshua Lund
bb4de94937 Removed merge conflict header 2013-06-18 15:01:01 -06:00
Michael DeHaan
b4358d1300 Merge branch 'apt_key_file' of git://github.com/veeti/ansible into devel
Conflicts:
	library/packaging/apt_key
2013-06-18 16:18:31 -04:00
Michael DeHaan
a94e404a97 Merge pull request #3236 from lwade/ec2_placementzone
Added placement_group parameter for cluster compute. Issue 3232.
2013-06-18 13:14:03 -07:00
Michael DeHaan
583b3e5957 Merge pull request #3251 from jlund/sucess-typo-fix
Fixed a few small typos
2013-06-18 11:47:49 -07:00
Michael DeHaan
2123507315 Merge branch 'sha256' of git://github.com/jlund/ansible into devel
Conflicts:
	library/network/get_url
2013-06-18 14:46:57 -04:00
Joshua Lund
ba853b8c1a Fixed a few small typos 2013-06-18 12:26:40 -06:00
Michael DeHaan
25b43cf6ec Merge pull request #3231 from jpmens/docs_more
Docs: consistently format playbook EXAMPLES
2013-06-17 20:48:02 -07:00
Brian Coca
c9c7b01620 now mount/unmount are searched for instead of hardcoded
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-06-17 17:01:35 -04:00
Veeti Paananen
77159d21da Add apt_key examples for file and data 2013-06-17 18:23:40 +03:00
lwade
886a71e8eb Added placement_group parameter for cluster compute. 2013-06-17 14:35:53 +01:00
Jan-Piet Mens
30d641094b Docs: consistently format playbook EXAMPLES 2013-06-17 08:53:46 +02:00
Michael DeHaan
bfcead8c33 Remove reference to non-existant module. 2013-06-16 23:33:49 -04:00
Yap Sok Ann
bcca609bc6 Add OpenRC support to the service module. 2013-06-17 11:29:48 +08:00
Michael DeHaan
e128e8b563 Merge pull request #3162 from strawlab/apt-key-binary-fix
allow apt-key module to work with binary key
2013-06-16 20:27:10 -07:00
Michael DeHaan
3e1e163ec3 Merge pull request #3172 from gw0/fix-mongodb2.2-compat
Fix `mongodb_user` compatibility with MongoDB 2.2 (used in Debian 7).
2013-06-16 20:24:31 -07:00
Michael DeHaan
fe9849530c Merge pull request #3120 from chrisgardner/solaris-os-facts
Add Solaris O/S distribution facts
2013-06-16 20:18:43 -07:00
Michael DeHaan
f698ab9232 Merge pull request #3204 from goozbach/devel
fixed msg bug in library/cloud/quantum_network
2013-06-16 20:16:14 -07:00
Jochen Maes
7b763dc487 adds 2 django commands (migrate, collectstatic)
Signed-off-by: Jochen Maes <jochen@sejo-it.be>
2013-06-16 23:15:43 -04:00
Michael DeHaan
2eb3a9a3c9 Resolve docs conflict. 2013-06-16 22:48:11 -04:00
Michael DeHaan
572f49b11f Fix merge conflict. 2013-06-16 22:47:29 -04:00
Michael DeHaan
c3544de1df Merge pull request #3228 from skvidal/facts.d
first cut and docs for facts.d mechanism for setup module
2013-06-16 19:46:02 -07:00
Michael DeHaan
58e8a97e91 Merge pull request #3225 from eest/openbsd_pkg-check_mode
openbsd_pkg: Add check_mode support.
2013-06-16 19:40:46 -07:00
Michael DeHaan
613df1d649 Merge pull request #3213 from veeti/apt_key_data
Document the data argument for apt_key
2013-06-16 19:39:55 -07:00
Michael DeHaan
d9f91be34a Merge pull request #3227 from bcoca/modules_wantlist
implementing with_items list globbing made easier for modules
2013-06-16 19:29:02 -07:00
Michael DeHaan
f87299842c Merge pull request #3199 from chrishoffman/doc_error
Fixing documentation error
2013-06-16 19:28:12 -07:00
Michael DeHaan
294230d529 Merge pull request #3177 from stintel/mysql56-compat
Fix MySQL 5.6 compatibility
2013-06-16 19:27:17 -07:00
Michael DeHaan
936e61fc28 Merge pull request #3181 from melodous/devel
HP-UX virtualization facts
2013-06-16 19:26:07 -07:00
trbs
a4223e119d fixed x-bits in git 2013-06-16 22:22:16 -04:00
Michael DeHaan
4849539399 Merge pull request #3194 from E-M/patch-2
Fixed Issue #3193 - make rhn_register module compatible with EL 5
2013-06-16 19:17:05 -07:00
Michael DeHaan
78fdedd490 Merge remote branch 'origin' into devel
Conflicts:
	library/web_infrastructure/django_manage
2013-06-16 22:15:30 -04:00
Michael DeHaan
512d7ba531 Spelling fixes 2013-06-16 22:09:35 -04:00
Michael DeHaan
f0d66f0cda Merge pull request #3176 from jpmens/sol-epoch
setup epoch time doesn't have tics on Python 2.6.4 (Solaris).
2013-06-16 19:06:19 -07:00
Seth Vidal
36df7e8c95 cut and docs for facts.d mechanism for setup module 2013-06-15 18:31:31 -04:00