Commit graph

6053 commits

Author SHA1 Message Date
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
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
trbs
87c7fa9138 enable use of multiple terms in first_found 2013-06-19 16:37:29 +02:00
Bruce Pennypacker
9098908cc8 Set master_password for modify command 2013-06-19 09:35:50 -04:00
martin f. krafft
ae42144752 Always assume purged for older python-apt
Older python-apt modules don't export Package.installed_files and there
seems to be no other way to figure out if a package is
removed-but-not-purged, so we just always assume it's purged.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-19 10:56:43 +02:00
Arturas Slajus
0ea0a2c6d7 datadog_event module requires urllib2, not httplib2. 2013-06-19 11:17:05 +03:00
martin f. krafft
420f7d7ac6 Introduce non-purged package status
A package may be removed but not purged with APT. The only way to
identify this state is by looking at the list of installed files of
a package. Even if the package has no files installed, this list will be
non-empty until the package is removed:

  # python -c "import apt; c=apt.Cache(); c.update(); c.open(); p=c['ruby1.8']; print p, p.installed, p.installed_files"
  <Package: name:'ruby1.8' id:1425> None [u'']

  # dpkg --purge ruby1.8
  (Reading database ... 27904 files and directories currently installed.)
  Removing ruby1.8 ...
  Purging configuration files for ruby1.8 ...

  # python -c "import apt; c=apt.Cache(); c.update(); c.open(); p=c['ruby1.8']; print p, p.installed, p.installed_files"
  <Package: name:'ruby1.8' id:1425> None []

See http://bugs.debian.org/712749 too.

If a package is not marked installed but it still 'has_files', then it
should be processed if the request is to purge it.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-19 10:00:33 +02:00
martin f. krafft
8e37a2bec9 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 10:00:33 +02:00
George Miroshnykov
c642ba77ae Added basic support for hash_behaviour=merge in roles
Dict vars passed to roles are now properly merged
instead of simply overriding dict vars that are
coming from vars_files.
2013-06-19 09:14:20 +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