Commit graph

6291 commits

Author SHA1 Message Date
Alan Grosskurth
5ccc7e7277 apt_key: Add 'keyring' parameter
The apt-key command takes an optional --keyring parameter representing
the path to a specific GPG keyring to operate on. If it's not given,
the command operates on all keyring files, i.e., /etc/apt/trusted.gpg
and /etc/apt/trusted.gpg.d/*.gpg.

This change adds a 'keyring' parameter to the apt_key module and
propagates it down to the apt-key command line. The main use case this
supports is organizing keys for third-party repos into individual
keyrings in /etc/apt/trusted.gpg.d, rather than putting them all in
the default keyring.
2013-07-24 18:10:17 -07:00
Ted M. Young
28e7a25143 Wrong target for link?
Came to here from http://www.ansibleworks.com/docs/bestpractices.html, but I think the link here meant to go to https://github.com/ansible/ansible-examples and not https://github.com/ansible/ansible-examples/tree/master/language_features?
2013-07-24 15:36:21 -07:00
Jonas Eriksson
16efb45735 Fix playbook-local host_vars when running from .
Since ansible 1.2, it became possible to place a host_vars
directory in the same directory as a playbook, making it possible
to keep host_vars local to that playbook there. However, due to
python's os.path.dirname, a action such as:

 $ ansible-playbook pb.yml

..would not pick up the host_vars as os.path.dirname("pb.yml")
returns "", unlike the unix command dirname that would return
".". Substituting "pb.yml" on the command line with "./pb.yml"
would do the trick, but is not always intuitive. This patch
solves the problem until python solves issue18547 [1].

[1] http://bugs.python.org/issue18547
2013-07-24 18:33:06 +02:00
Andreas Kaiser
f2e3fa9508 Fix pkgin search (yielding wrong results under certain conditions, see inline comments). 2013-07-24 16:18:14 +02:00
Vincent Hardion
09ef7751e1 Fix nested loop for more than 3 elements
- combine flatten list for each nested level instead once at the end
2013-07-24 14:19:13 +02:00
Nicholas Kuechler
b8edbd0c0e Add example with multiple files. 2013-07-23 23:09:02 -05:00
Nicholas Kuechler
72238889c3 Update docs and example for injecting files. 2013-07-23 22:49:17 -05:00
Brian Coca
576962d335 now if you set fork to 0 or a number higher than the number of hosts, it
will be readjusted to the number of hosts runner is going to deal with.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-23 20:44:06 -04:00
Alan Descoins
d505474832 Updated documentation. 2013-07-23 19:49:27 -03:00
Alan Descoins
c19c2c7295 ansible-playbook can load extra vars from a file, with "@" syntax 2013-07-23 19:39:39 -03:00
Stoned Elipot
a1503c4d59 stringify conditional before handing it to Jinja2 for evaluation.
This should fix simple conditionals like:

    when: ansible_selinux

While here add tests for ansible.utils.check_conditional() in
"jinja2_compare mode".
2013-07-23 22:24:53 +02:00
Ivan Lezhnjov IV
d4f75bc12c Proper support for RHEL/CentOS 5 (the only thing it needs now is to call python26) 2013-07-23 10:45:08 -07:00
Curtis
c1c1b128f8 changed apikey and apiid to api_key and api_id and noted that it is boundary tags not ansible tags as per mpdehaan 2013-07-23 11:16:30 -06:00
WAKAYAMA Shirou
0ce99e391f fix: if a path is symlink and trying to chmod, OSError Exception will be raised. 2013-07-23 22:14:48 +09:00
Eivind Uggedal
35b918359b Pacman module: recursive remove support 2013-07-23 15:01:13 +02:00
Stijn Tintel
9d0fc0fd67 Only revoke GRANT OPTION when user actually has it
When revoking privileges from a user, the GRANT OPTION is always
revoked, even if the user doesn't have it. If the user exists, this
doesn't give an error, but if the user doesn't exist, it does:

mysql> GRANT ALL ON test.* TO 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE GRANT OPTION ON test.* FROM 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE GRANT OPTION ON test.* FROM 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE ALL ON test.* FROM 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE GRANT OPTION ON test.* FROM 'test'@'localhost';
ERROR 1141 (42000): There is no such grant defined for user 'test' on
host 'localhost'

Additionally, in MySQL 5.6 this breaks replication because of
http://bugs.mysql.com/bug.php?id=68892.

Rather than revoking the GRANT OPTION and catching the error, check if
the user actually has it and only revoke it when he does.
2013-07-23 13:00:29 +02:00
Peter Hall
d1369f3d95 Adding getstr mode to download an object into a variable 2013-07-23 11:03:00 +10:00
Michael DeHaan
d1effecb2e Merge pull request #3628 from jlund/yaml-syntax
Minor cleanup of YAML Syntax documentation
2013-07-22 15:20:53 -07:00
Joshua Lund
be6feee058 Minor cleanup of YAML Syntax documentation 2013-07-22 16:09:18 -06:00
Ralph Tice
1529a974e1 fixed vpc provisioning / clarified group_id usage 2013-07-22 17:00:13 -05:00
Michael DeHaan
86f05f11e7 Merge branch 'devel' of github.com:ansible/ansible into devel 2013-07-22 15:16:47 -04:00
Michael DeHaan
a35370a766 Fix prev feature commit, Do not require aptitude to use apt commands in the apt module, only needed when upgrading. 2013-07-22 15:15:55 -04:00
Michael DeHaan
fc9aa5f014 Continue on mount errors, don't fail the setup module. 2013-07-22 13:57:35 -04:00
Michael DeHaan
f0eafff1b4 Merge pull request #3621 from sergevanginderachter/rename2flattened
also rename plugin name in error message
2013-07-22 10:32:38 -07:00
Ralph Tice
2383a8205c changed role path template to read all vars instead of just extra_vars 2013-07-22 09:59:26 -05:00
Michael DeHaan
9c9bc09ce6 Merge pull request #3622 from bcoca/fix_the_stat_fix
use global to fail as its not in self
2013-07-22 07:56:49 -07:00
Brian Coca
3f85a82ae9 use global to fail as its not in self
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-22 10:54:20 -04:00
Serge van Ginderachter
b40295910d also rename plugin name in error message 2013-07-22 16:47:36 +02:00
Michael DeHaan
2fe25f19dc Fix to group_by module as a result of previous conditional upgrades. 2013-07-22 10:11:19 -04:00
Michael DeHaan
e3f213e030 Fixup error reporting. 2013-07-22 08:35:31 -04:00
Michael DeHaan
c07dd07767 Add raw copy support (raw=yes), tweak tempfile error message string. 2013-07-22 08:25:55 -04:00
Michael DeHaan
2e38d92262 Merge pull request #3619 from ches/doc-fixes
Enhance meta-docs on... contributing to docs.
2013-07-22 04:43:50 -07:00
Michael DeHaan
5e02759570 Merge pull request #3617 from dermute/devel
svr4pkg doesn't work on Sol10
2013-07-22 04:37:10 -07:00
Ches Martin
b35fc42d36 Enhance meta-docs on... contributing to docs.
- Update FAQ entry to refer to docsite README and reduce redundancy.

- Add additional info to docsite README: Sphinx building, link to module
  documentation reference.
2013-07-22 17:20:38 +07:00
Michael DeHaan
a7a82c79c0 Merge pull request #3611 from tgerla/docsfix
very minor fix to playbooks2 to fix a formatting error
2013-07-21 12:47:03 -07:00
Tim Gerla
7e07bca6bf very minor fix to playbooks2 to fix a formatting error 2013-07-21 11:50:12 -07:00
Michael DeHaan
524c7bd791 Remove end of line semicolons. 2013-07-21 11:55:38 -04:00
Michael DeHaan
19d78d6e18 Remove reference to 'context' since it's not implemented. 2013-07-21 11:52:22 -04:00
Michael DeHaan
0cf5e5cec3 Merge branch 'devel' of git://github.com/bradleyy/ansible into together 2013-07-21 11:47:05 -04:00
Michael DeHaan
c5cbb1dc62 Fix route53 module docs version/module name 2013-07-21 11:20:37 -04:00
Michael DeHaan
77a4dcca85 Sphinx/docs syntax fixes 2013-07-21 11:18:07 -04:00
Michael DeHaan
10f99938b9 Fix YAML doc errors. 2013-07-21 11:15:06 -04:00
Michael DeHaan
af94fb8eea Update changelog 2013-07-21 11:12:30 -04:00
Michael DeHaan
7961a81b3f Update docs to add version_added attribute. 2013-07-21 11:12:04 -04:00
Michael DeHaan
32b3c59bad Merge pull request #3400 from diko4096/patch-1
Update gem
2013-07-21 08:10:27 -07:00
Michael DeHaan
fc70fbcab0 update changelog 2013-07-21 10:54:57 -04:00
Michael DeHaan
5fe1f03885 Merge pull request #3413 from evan82/devel
Added module for baking EC2 AMIs
2013-07-21 07:53:54 -07:00
Michael DeHaan
e2af927c3f Take notes on features that need to be documented in CHANGELOG 2013-07-21 10:49:08 -04:00
Michael DeHaan
feb4a8847d Slight edit to when_changed docs 2013-07-21 10:48:22 -04:00
Michael DeHaan
b603bb0f73 Merge branch 'changed_when-doc' of git://github.com/stoned/ansible into devel 2013-07-21 10:41:35 -04:00