James Cammarata
3fd0eefb97
Merge branch 'digital_ocean_idempotence_take2' of https://github.com/ralphbean/ansible into ralphbean-digital_ocean_idempotence_take2
2013-09-25 16:47:13 -05:00
James Cammarata
8b010cbb45
Make the ec2 wait code a little smarter
...
The code to determine the number of running instances could blow up
if the response from AWS did not actually contain any data. This code
makes it a bit smarter in handling, so that it will wait for a valid
response regardless of the wait condition.
Fixes #3980
2013-09-25 16:16:52 -05:00
James Cammarata
301a00ccf5
Merge branch 'obsd-fix-release' of https://github.com/johanwiren/ansible into johanwiren-obsd-fix-release
2013-09-25 14:49:57 -05:00
James Cammarata
b41ea366c8
Doc fix in htpasswd module due to colon on the line
2013-09-25 14:46:16 -05:00
James Cammarata
786a765063
Merge branch 'add-scheme-to-htpasswd-params' of https://github.com/PugglePay/ansible into PugglePay-add-scheme-to-htpasswd-params
2013-09-25 14:39:14 -05:00
James Cammarata
23417368df
Fixing up some open_iscsi docs and CHANGELOG update
2013-09-25 14:37:56 -05:00
James Cammarata
c98ed252fe
Merge branch 'open_iscsi_bis' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-open_iscsi_bis
2013-09-25 14:35:01 -05:00
James Cammarata
776fc044dd
Merge pull request #4231 from drfickle/svn_docs
...
Elaborate on capabilities of subversion module
2013-09-24 11:15:52 -07:00
Steve Fox
bd48251b34
Elaborate on capabilities of subversion module
2013-09-24 11:10:09 -05:00
James Cammarata
a2be93e4b8
Merge pull request #4229 from eggsby/supervisorctl
...
supervisorctl module: fixing typo in error handling
2013-09-24 08:48:15 -07:00
egghead
255d2d6770
supervisorctl module: fixing typo in error handling
2013-09-24 15:36:16 +00:00
Rene Moser
ff84812047
host: minor doc style improvements
2013-09-24 15:47:39 +02:00
Michael DeHaan
314e1aafc1
Merge pull request #4220 from dagwieers/setup-dmidecode-fix
...
Fix for commented dmidecode output
2013-09-24 05:04:33 -07:00
Dag Wieers
5bd7664fac
Fix for commented dmidecode output
...
This patch fixes the problem that on some system dmidecode prints out warning information as commented text. For example:
[user@system ~]# dmidecode -s system-manufacturer
# SMBIOS implementations newer than version 2.6 are not
# fully supported by this version of dmidecode.
HP
So we remove all commented lines from the output.
2013-09-24 12:46:48 +02:00
Rene Moser
803b2b91a6
host: added another example
2013-09-24 09:15:16 +02:00
James Cammarata
93336ce00d
Merge branch 'devel' of https://github.com/volker48/ansible into volker48-devel
2013-09-23 21:24:43 -05:00
James Cammarata
a6d62ef59b
Minor pep8 cleanup
2013-09-23 16:37:42 -05:00
James Cammarata
29bff3ffc1
Merge branch 'supervisorctl' of https://github.com/eggsby/ansible into eggsby-supervisorctl
2013-09-23 16:31:50 -05:00
James Cammarata
4420379f59
Fixing some bugs found during testing in the host module
2013-09-23 16:05:43 -05:00
James Cammarata
da0d50c383
Merge branch 'feature/host' of https://github.com/resmo/ansible into resmo-feature/host
2013-09-23 15:42:30 -05:00
James Cammarata
d647c5dc00
Added a delimiter example and a version_added string for assemble
2013-09-23 15:32:36 -05:00
James Cammarata
a97872906f
Fixed a bug in the delimiter change for the assemble module
2013-09-23 15:29:13 -05:00
James Cammarata
bcf9a75d94
Merge branch 'devel' of https://github.com/pcgentry/ansible into pcgentry-devel
2013-09-23 15:18:15 -05:00
James Cammarata
a8fac7906d
Merge branch 'devel' of https://github.com/drybjed/ansible into drybjed-devel
2013-09-23 15:10:40 -05:00
James Cammarata
c31ece58fa
Added version_added string to new modprobe module and CHANGELOG update
2013-09-23 15:02:02 -05:00
James Cammarata
4d7b5da25d
Merge branch 'modprobe-module' of https://github.com/stygstra/ansible into stygstra-modprobe-module
2013-09-23 15:00:50 -05:00
James Cammarata
30a1560d67
Merge branch 'devel' of https://github.com/tomdymond/ansible into tomdymond-devel
2013-09-23 14:53:46 -05:00
James Cammarata
080f35f63a
Merge branch 'ec2_boto' of https://github.com/CharlesBlonde/ansible into CharlesBlonde-ec2_boto
2013-09-23 14:20:23 -05:00
James Cammarata
ca2950141b
Merge branch 'bcoca-env_facts' into devel
2013-09-23 14:18:27 -05:00
James Cammarata
d1f713938e
Modified env fact gathering to use the native python method
...
Also updated CHANGELOG for this feature
2013-09-23 14:17:40 -05:00
James Cammarata
19343288df
Merge branch 'env_facts' of https://github.com/bcoca/ansible into bcoca-env_facts
2013-09-23 13:46:11 -05:00
Michael DeHaan
0dc232a177
Merge pull request #4159 from stygstra/quantum_subnet-nameservers
...
Add option for DNS nameservers to quantum_subnet module
2013-09-23 08:26:13 -07:00
Maciej Delmanowski
551b93c547
Made re.search string shorter
2013-09-23 12:27:14 +02:00
Maciej Delmanowski
40b0471e95
Add Linux Container identification
2013-09-23 12:15:33 +02:00
Andrey Shorin
ea488f5e05
Make --check mode work with fireball and accelerate connections
2013-09-23 13:51:43 +04:00
James Cammarata
4a467f71cd
Change touched -> touch for new file state, and cleaning up docs
2013-09-22 09:16:07 -05:00
James Cammarata
4d417401c0
Merge branch 'feature/file-state-touched' of https://github.com/resmo/ansible into resmo-feature/file-state-touched
2013-09-22 09:03:27 -05:00
Johan Wirén
e9554e5da2
Fixed setup module to no longer break on OpenBSD release versions.
2013-09-22 14:05:22 +02:00
René Moser
3a0fd84115
file: added file attributes in state=touched
2013-09-22 12:54:24 +02:00
René Moser
573ea5bdce
file: skip in check_mode if state=touched
2013-09-22 12:53:49 +02:00
egghead
3f4dc876fc
supervisorctl module: adding support for custom supervisord installations
...
Supervisord can be installed at the user level or system level.
Installating as a user is particularly useful for systems without root access.
Adds the ability to provide a custom supervisorctl executable path, supporting custom installations
2013-09-21 18:13:33 +00:00
René Moser
06fae59e8b
file: implemented state=touched. Closes GH-4097
2013-09-21 15:07:50 +02:00
James Cammarata
4efdf0d49f
More housekeeping
...
* Modified version_added strings in recent modules
* Added firewalld inclusion to the CHANGELOG
2013-09-21 01:06:34 -05:00
James Cammarata
8721ad2909
Moving firewalld module from net_infra to system
2013-09-21 01:02:19 -05:00
James Cammarata
720b68a3c6
Merge branch 'maxamillion/firewalld' of https://github.com/maxamillion/ansible into maxamillion-maxamillion/firewalld
2013-09-21 01:01:07 -05:00
James Cammarata
a26c1b64c6
Minor pep8 cleanup in ec2_eip module
2013-09-21 00:45:27 -05:00
James Cammarata
f369650922
Merge branch 'ec2_eip' of https://github.com/lorin/ansible into lorin-ec2_eip
2013-09-21 00:44:27 -05:00
James Cammarata
ecaf649adc
Changed the version_added field in rax_clb_nodes to 1.4
2013-09-20 16:58:59 -05:00
James Cammarata
93fd06d48c
Minor doc fix and a CHANGELOG update for the new rax_clb_nodes module
2013-09-20 16:57:29 -05:00
James Cammarata
e4ee97384a
Merge branch 'rax-clb-nodes' of https://github.com/neuroid/ansible into neuroid-rax-clb-nodes
2013-09-20 16:49:50 -05:00