Commit graph

5663 commits

Author SHA1 Message Date
martin f. krafft
85b8538e0e Expand usage of Python 2.6 if statement
Syntax like "'foo' if bar else 'baz'" is not supported by all Python
versions targetted by Ansible. Hence we break it up.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-23 09:19:27 +02:00
martin f. krafft
3df2e15277 Let update-rc.d set changed flag properly
When update-rc.d is used to enable/disable service, the changed flag was
always true (see #2189). This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-22 20:04:37 +02:00
Michael DeHaan
c7c5ac1ab6 Merge pull request #3288 from espro/devel
Update ansible.cfg
2013-06-20 14:08:45 -07:00
espro
3eeacaba81 Updated ansible.cfg to be more consistent
Updated the example ansible.cfg to be more consistent in spacing/commented lines
2013-06-20 17:19:47 -03:00
espro
a00c7b0c08 Comment remote_user in ansible.cfg
remote_user should not be set in example config. This file is used in rpm .spec for /etc/ansible/ansible.cfg
2013-06-20 16:14:15 -04:00
espro
e2cf3b2d29 Update ansible.cfg
Previous commit made config invalid.
2013-06-20 15:47:45 -04:00
Michael DeHaan
995ef374db Fixup versions of newly added modules. 2013-06-19 22:39:08 -04:00
Michael DeHaan
85ef79443a Fix a documentation formatting warning. 2013-06-19 22:38:04 -04:00
Michael DeHaan
3f8aa8aec5 Fix up some module docs formatting errors. 2013-06-19 22:37:09 -04:00
Michael DeHaan
231d9b101d YAML fix 2013-06-19 22:33:19 -04:00
Michael DeHaan
b72109a04b Merge pull request #3273 from jlund/ansiblecc-to-ansibleworkscom
Update all ansible.cc references in the documentation to point to ansibleworks.com
2013-06-19 19:31:34 -07:00
Michael DeHaan
727cee509c Merge branch 'PR_add_chdir_to_pip' of git://github.com/y-p/ansible into devel
Conflicts:
	library/packaging/pip
2013-06-19 22:30:44 -04:00
Michael DeHaan
4c51a6141b Merge remote branch 'origin/devel' into devel 2013-06-19 22:29:12 -04:00
Michael DeHaan
010440dc47 Merge pull request #3114 from laggyluke/roles_combine_vars
Added basic support for hash_behaviour=merge in roles
2013-06-19 19:27:27 -07:00
Michael DeHaan
200bd75426 Merge pull request #3149 from blandonnimrat/devel
added error checking on connect_to_region() in ec2.py
2013-06-19 19:26:17 -07:00
Michael DeHaan
49eb772667 Update changelog 2013-06-19 22:25:48 -04:00
Michael DeHaan
4c43264033 Various code reformatting 2013-06-19 22:23:31 -04:00
Michael DeHaan
db94171f5b Merge branch 'rds' of git://github.com/bpennypacker/ansible into rds 2013-06-19 22:11:41 -04:00
Michael DeHaan
2ed9b52481 Quote some strings in the docs 2013-06-19 22:10:48 -04:00
Michael DeHaan
3570c191c0 Update changelog 2013-06-19 22:10:01 -04:00
Michael DeHaan
dbbb2bc269 Merge remote branch 'origin/devel' into devel 2013-06-19 22:09:22 -04:00
Michael DeHaan
e1abda42a9 Merge pull request #3171 from mynameisdaniil/devel
Adds 'groups' field into ec2 plugin
2013-06-19 19:06:29 -07:00
Michael DeHaan
3060e66e77 Update CHANGELOG 2013-06-19 22:03:49 -04:00
Michael DeHaan
7b7cd855c4 Merge pull request #3091 from sdossett/with_inventory_hostnames
with_inventory_hostnames inventory based lookup plugin
2013-06-19 19:02:55 -07:00
Michael DeHaan
fc45470162 Merge branch 'with_inventory_hostnames' of git://github.com/sdossett/ansible into inv_hostnames 2013-06-19 22:01:57 -04:00
Michael DeHaan
c80ad67d7e Merge pull request #3226 from jpmens/ini_file2
ini_file: add support for lists of options/values
2013-06-19 18:59:19 -07:00
Michael DeHaan
b1596073c5 update changelog 2013-06-19 21:58:38 -04:00
Michael DeHaan
2e680019c9 Merge remote branch 'origin/devel' into devel 2013-06-19 21:56:59 -04:00
Michael DeHaan
faaa90ed03 Merge branch 'ocean' into devel
Conflicts:
	library/cloud/digital_ocean
2013-06-19 21:53:33 -04:00
Michael DeHaan
c9c45ac597 Reformat examples 2013-06-19 21:52:59 -04:00
Vincent Viallet
cc1cb01540 Rename digital ocean module to digital_ocean, add documentation. 2013-06-19 21:49:05 -04:00
Vincent Viallet
66b5689afb Ensure an existing ssh-key returns useful information (id + name) instead of a string; this way it can be used to register a variable to use in a later task. 2013-06-19 21:48:52 -04:00
Vincent Viallet
60d1ff125e Add digital-ocean cloud support. 2013-06-19 21:48:41 -04:00
Michael DeHaan
f9a09e10e5 Merge branch 'digitalocean' of git://github.com/devo-ps/ansible into ocean 2013-06-19 21:48:19 -04:00
Michael DeHaan
5ac1e7d0ca Merge pull request #3209 from madduck/generalise-hacking-dir-path-discovery
Generalise hacking dir path discovery
2013-06-19 18:47:21 -07:00
Michael DeHaan
4553b3d0cf Merge branch 'generalise-hacking-dir-path-discovery' of git://github.com/madduck/ansible into envsetup2 2013-06-19 21:43:59 -04:00
Michael DeHaan
0ce7996bb6 Merge pull request #3266 from trbs/20130619_first_found
enable use of multiple terms in first_found
2013-06-19 18:39:29 -07:00
Michael DeHaan
ffb94f2e71 Merge branch 'purge' into devel 2013-06-19 21:38:39 -04:00
martin f. krafft
6a7dac6176 Fix purging of packages
A small error in the reuse of a variable caused packages to never get
purged. This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-19 21:37:37 -04:00
Michael DeHaan
50fa88f28a Merge branch 'fix-apt-purge' of git://github.com/madduck/ansible into purge 2013-06-19 21:35:28 -04:00
Joshua Lund
0f81d1630f * Updated all ansible.cc references in the documentation to point
to ansibleworks.com
* Fixed a few misspelled words
2013-06-19 19:34:02 -06:00
Michael DeHaan
6d6df1959c Merge pull request #3259 from dirtyharrycallahan/b_setup
bug fix: modify get_device_facts to handle servers with multiple pci domains
2013-06-19 18:24:10 -07:00
Michael DeHaan
d2721526de Small tweak, don't merge conditionals, just evaluate each in turn. 2013-06-19 21:18:05 -04:00
Michael DeHaan
58f5bfb4c1 Merge pull request #3252 from tgerla/gettingstarted
Explicitly mention the Linux requirement for the Ansible machine, remove...
2013-06-19 17:08:11 -07:00
Michael DeHaan
20104bf14d Correct description in CHANGELOG 2013-06-19 19:56:59 -04:00
Michael DeHaan
6ff05e0fc0 Update CHANGELOG 2013-06-19 19:01:18 -04:00
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
Daniil
07bea63533 Allow 'ec2.group' field to handle lists of groups 2013-06-20 01:23:30 +04:00
Michael DeHaan
e8db983684 Merge pull request #3267 from SirScott/changelog
It's WITH_ITEMS_USES_LIST not WITH_ITEMS_WANTS_LIST.
2013-06-19 14:16:23 -07:00
Scott Sturdivant
46c7809e6e It's WITH_ITEMS_USES_LIST not WITH_ITEMS_WANTS_LIST. 2013-06-19 09:44:21 -06:00