Commit graph

6101 commits

Author SHA1 Message Date
Michael DeHaan
7f77b6c72e Merge pull request #3722 from bcoca/lvg_gets_bin_path
now uses get_bin_path for lvg executables
2013-08-01 17:17:21 -07:00
Michael DeHaan
bdef7f1774 Merge pull request #3711 from ashorin/devel
Allow --diff on UTF-8 encoded files and templates
2013-08-01 17:16:32 -07:00
Michael DeHaan
44d060628e Merge pull request #3706 from lorin/sudo_user_breakage
Fix sudo_user copy error
2013-08-01 17:15:26 -07:00
Michael DeHaan
daf5ecc7c9 Merge pull request #3684 from stoned/fix-3668
Add extra module path early during playbook parsing.
2013-08-01 17:14:35 -07:00
Michael DeHaan
83481b32cc Merge pull request #3657 from zqad/devel
Fix playbook-local host_vars when running from .
2013-08-01 17:13:04 -07:00
Michael DeHaan
4db413db6a Merge pull request #3655 from disko/pkgin_search_fix
Fix pkgin search
2013-08-01 17:12:16 -07:00
Michael DeHaan
3ebbb56479 Merge pull request #3654 from MaxIV-KitsControls/devel
Fix nested loop for more than 3 elements
2013-08-01 17:11:26 -07:00
Michael DeHaan
422233bc91 Merge pull request #3648 from echohead/glance-image-timeout
Fix 'timeout' parameter of glance-image module.
2013-08-01 17:09:44 -07:00
Michael DeHaan
7813290969 Merge pull request #3645 from stoned/stringify-conditional-2
stringify conditional before handing it to Jinja2 for evaluation.
2013-08-01 17:08:34 -07:00
Michael DeHaan
b2d2c40538 Merge pull request #3638 from shirou/devel
fix: if a path is symlink and trying to chmod, OSError Exception will be raised
2013-08-01 17:07:22 -07:00
Michael DeHaan
3584aecc2b Merge pull request #3676 from bcoca/debug_doc_update
updated debug module docs to remove outdated -v requirement
2013-08-01 17:05:23 -07:00
Michael DeHaan
d5d81813a6 Merge pull request #3634 from stintel/mysql-revoke-grant-option
Only revoke GRANT OPTION when user actually has it
2013-08-01 17:04:54 -07:00
Brian Coca
0ae7bcf3e2 fixed bug from prev update
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-08-01 00:24:34 -04:00
Brian Coca
1e1f117886 whitespace updates on new lines
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-31 23:26:28 -04:00
Brian Coca
d8e8aa714e now uses get_bin_path for lvg executables
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-31 22:32:41 -04:00
Andrey Shorin
664215eb02 Allow --diff on UTF-8 encoded files and templates 2013-07-31 15:58:32 +04:00
Lorin Hochstein
a303fca193 Fix sudo_user copy regression
Treat errno 13 (permission denied) as one of the special cases in
atomic_move.

This type of error can occur because of sudo'ing to non-root user.

Fixes #3705
2013-07-30 16:14:29 -04:00
Michael DeHaan
8cc13590b4 Make exceptions handling python 2.4 compatible. 2013-07-29 13:27:16 -04:00
Michael DeHaan
6854857533 update CHANGELOG 2013-07-29 13:26:33 -04:00
Stoned Elipot
841093921b Add extra module path early during playbook parsing.
This should fix issue #3668

Also prevent an extra module path to be added multiple times.
2013-07-28 18:47:26 +02:00
Michael DeHaan
ed55ac1a15 Merge pull request #3666 from bpennypacker/statdoc
doc update for stat module
2013-07-28 06:23:14 -07:00
Michael DeHaan
eceaa551d6 correct misnamed variable in changelog. 2013-07-28 09:15:08 -04:00
Michael DeHaan
ec25147fc1 Merge pull request #3629 from ralph-tice/fix-3626
fixed vpc provisioning / clarified group_id usage
2013-07-28 06:14:56 -07:00
Brian Coca
5ca1630b71 updated debug module docs to remove outdated -v requirement (and
only_if reference)
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-26 10:06:57 -04:00
Tim Miller
edbac1f14e Fix 'timeout' parameter of glance-image module.
The timeout parameter of glance-image was not being parsed into a
numeric type, causing the following error when specifying timeout:

    msg: Error in creating image: unsupported operand type(s) for +: 'float' and 'str'
2013-07-25 14:54:21 -07:00
Bruce Pennypacker
0bbbefeb3f doc update 2013-07-25 09:59:23 -04: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
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
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
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
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
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