James Cammarata
a0f939581d
Merge branch 'aresch-devel' into devel
2014-03-06 16:47:06 -06:00
Richard Isaacson
119434d079
Merge pull request #6319 from risaacson/fix_test_dir_inventory
...
Fix TestInventory Unit Tests
Tested clean.
2014-03-06 15:43:45 -06:00
James Cammarata
9b79591f23
Merge branch 'devel' of https://github.com/aresch/ansible into aresch-devel
2014-03-06 15:17:55 -06:00
James Laska
868746b095
Correct ansible_distribution typo
...
Redhat != RedHat
2014-03-06 16:16:00 -05:00
James Laska
ba9950a73a
Use correct value of ansible_distribution in integration tests
...
This fixes integration tests when run on a RHEL system. Oddly, the
ansible_distribution='RedHat' when run on RHEL.
2014-03-06 15:52:15 -05:00
James Cammarata
5a235f9e99
Merge pull request #6318 from jimi-c/issue_5305_ec2_elb_None_issue
...
Adding a wait loop to ec2_elb for the initial lb state when registering
2014-03-06 14:01:11 -06:00
James Tanner
85bc14a8eb
Remve debug file from vault unit test
2014-03-06 14:49:55 -05:00
James Cammarata
2a0028e687
Sanitize run_command argument output
...
Fixes #6316
2014-03-06 13:34:22 -06:00
Richard C Isaacson
913c855df4
Formatting cleanup.
...
Post merging of GH-5837 via GH-5749.
2014-03-06 13:08:35 -06:00
g-k-r
dbad5d71c6
modifed test to use get_hosts instead of get_groups
...
closes #5749
Conflicts:
test/units/TestInventory.py
2014-03-06 13:06:08 -06:00
g-k-r
6626cb0b3d
add test same host in different files in dir
...
tests issue #5749
same host defined in different groups which in turn are defined
in different ini files in an inventory directory
Conflicts:
test/units/TestInventory.py
2014-03-06 13:03:25 -06:00
James Tanner
cd6d7ddc97
Fix test_async by using env python
2014-03-06 13:32:05 -05:00
Andrew Resch
4d80019ac8
Fix logic checking for both sudo and su, and their respective users
2014-03-06 10:24:16 -08:00
James Cammarata
245b10eaa5
Merge pull request #6317 from l0neranger/devel
...
Typo
2014-03-06 12:14:43 -06:00
Richard C Isaacson
16fe09eef8
Fixes related to uncommenting test_dir_inventory in TestInventory.
...
0. Uncomment the test.
1. Test fails.
2. Make vars unique per file in test inventory files.
3. Modify token addition to not ast.literal_eval(v) a variable containing a hash.
4. Modify vars to have an escape in test inventory file.
5. Catch exceptions explicitly. Any unknown exceptions should be a bug.
6. Test passes.
2014-03-06 12:09:53 -06:00
Harsha Yalamanchili
cc5cf9ec63
Typo
2014-03-06 09:36:51 -08:00
Michael DeHaan
616d7e53b1
Merge pull request #6305 from amree/fix-mysql-replication-port
...
Fixed SQL syntax error when running mysql_replication module
2014-03-06 11:08:12 -06:00
Michael DeHaan
7710867922
Merge pull request #6308 from muffl0n/file_fix_documentation
...
Module "file": Fix link to "path" in documentation
2014-03-06 11:04:47 -06:00
Michael DeHaan
acd64bf5a1
Merge pull request #6313 from phenomenes/msg-encoding-fix
...
Don't use keyword `error` in encode
2014-03-06 10:59:11 -06:00
James Cammarata
9f2999df79
Un-escape newlines in delimiters for assemble module
2014-03-06 09:44:56 -06:00
James Cammarata
d76f49a827
Merge pull request #6311 from bcoca/tag_sets_fix
...
tags lists are properly uniqued and joined now
2014-03-06 09:23:09 -06:00
Brian Coca
79809b67dc
fixed another line with same issues
...
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2014-03-06 08:43:24 -05:00
Jimena Cabrera-Notari
cc6e1ec261
Don't use keyword error
in encode
...
This is not supported in Python 2.6. Just use positional arguments.
2014-03-06 13:33:53 +00:00
Brian Coca
d3d5680d8f
tags lists are properly uniqued and joined now, also avoids type issues when passed as list/set or strings
...
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2014-03-06 08:28:36 -05:00
Sven Schliesing
f62cc1e351
Fix link in documentation
...
c(dest) -> c(path)
2014-03-06 13:16:29 +01:00
amree
1d731e5c30
MASTER_PORT variable for CHANGE MASTER TO command can only accept integer value
2014-03-06 12:19:54 +08:00
James Cammarata
25cf215f54
Create the tempdir in the accelerate module if it doesn't exist
...
Fixes #6047
2014-03-05 22:08:09 -06:00
Michael DeHaan
372ae072fd
Merge pull request #6300 from l0neranger/devel
...
Update debian install documentation to include dependency resolution
2014-03-05 20:48:41 -05:00
Michael DeHaan
ff658caafb
Merge pull request #6297 from ardentperf/patch-1
...
Update playbooks_vault.rst
2014-03-05 20:48:04 -05:00
James Cammarata
0e98496e12
Merge pull request #6299 from jimi-c/issue_4656_role_deps_across_plays
...
Keep track of role dependencies across plays
2014-03-05 19:46:46 -06:00
Michael DeHaan
94a7fb60fe
Allow escaped comments in inventory files.
2014-03-05 20:10:25 -05:00
aresch
23a0468a4b
Fix respecting remote_tmp when sudo is used
2014-03-05 16:25:42 -08:00
James Tanner
4e8ed92130
Fixes #6077 decode escaped newline characters in content for the copy module
2014-03-05 18:49:54 -05:00
Harsha Yalamanchili
063dc5e971
Update debian install documentation to include dependency resolution
2014-03-05 14:04:36 -08:00
Harsha Yalamanchili
c09e0211f7
Update debian install documentation to include dependency resolution
2014-03-05 14:02:16 -08:00
Richard C Isaacson
b41d8106ff
Revert "Merge pull request #6287 from risaacson/fix_hash_in_var"
...
This reverts commit a808287451
, reversing
changes made to 6129ea7566
.
2014-03-05 14:49:30 -06:00
James Cammarata
73c883c122
Keep track of role dependencies across plays
...
Also fixes a bug in which tags specified on top-level roles were
not being passed down to dependent roles.
Fixes #4656
2014-03-05 14:37:37 -06:00
Richard Isaacson
a808287451
Merge pull request #6287 from risaacson/fix_hash_in_var
...
Fix inventory for test_dir_inventory, merge PRs from GH-5749, cleanup some formatting.
2014-03-05 14:20:27 -06:00
James Tanner
6129ea7566
Fixes #6298 and adds a sudo unit test for synchronize
2014-03-05 14:51:40 -05:00
Richard C Isaacson
22a1fb28d6
Minor cleanup.
2014-03-05 13:44:15 -06:00
g-k-r
a3c36a6853
modifed test to use get_hosts instead of get_groups
...
closes #5749
Conflicts:
test/units/TestInventory.py
2014-03-05 13:29:47 -06:00
g-k-r
23fee4b836
add test same host in different files in dir
...
tests issue #5749
same host defined in different groups which in turn are defined
in different ini files in an inventory directory
Conflicts:
test/units/TestInventory.py
2014-03-05 13:27:39 -06:00
jctanner
6a615f18c5
Merge pull request #5872 from tomdymond/add-ignoreerror-to-sysctl
...
Add option to enable the sysctl -e option
2014-03-05 12:58:05 -05:00
Richard C Isaacson
38abd5e20e
Break this out into a reusable function and document regex shortcomings.
2014-03-05 10:50:58 -06:00
Jeremy Schneider
c4fea2d5b6
Update playbooks_vault.rst
...
very minor grammatical fix for readability
2014-03-05 10:01:41 -06:00
Michael DeHaan
b5e487f2d9
Merge pull request #6290 from lberruti/fix_complex_args
...
fixes #6244
2014-03-05 08:06:39 -05:00
Luca Berruti
7cf363910a
fixes #6244
2014-03-05 09:18:01 +01:00
jctanner
40ee030790
Merge pull request #6265 from franckcuny/gce-fixes
...
Add credential parameters to the GCE modules.
2014-03-05 00:11:52 -05:00
Franck Cuny
6294264dc4
Add credential parameters to the GCE modules.
...
In order to simplify the workflow with the GCE modules, it's now
possible to add the parameters and project name as arguments to the
various GCE modules.
The inventory plugin also returns the IP of the host in
`ansible_ssh_host` so that you don't have to specify IPs into the
inventory file.
Some update to the documentation are also added.
Closes #5583 .
2014-03-04 19:27:49 -08:00
Richard C Isaacson
49bd8b0b35
Fix inventory for test_dir_inventory
...
It came up that fixing this unit test may relate to another ticket that is open. This work allows us to uncomment this unit test by fixing how we pars variables allowing a quoted variable to contain a '#'.
Work also went into cleaning up some of the test data to clarify what was working.
Lastly work went into cleaning up formatting so that the code is easily read.
2014-03-04 18:31:49 -06:00