James Cammarata
809b931640
Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir
...
Do not base synchronize source on the inventory directory
2014-05-13 11:05:19 -05:00
James Cammarata
d75eb03080
Merge pull request #7380 from carsongee/cg/quantum_ip_subnet
...
Fix missing variable initialization so an unspecified internal_network works
2014-05-13 10:59:15 -05:00
James Cammarata
e17afa06ef
Merge branch 'marcore-devel' into devel
2014-05-13 09:28:48 -05:00
Carson Gee
e6fbd2d8cb
Fix missing variable initialization so an unspecified internal_network runs
2014-05-13 09:56:13 -04:00
Marco Re
712f4a631c
Update ssh.py
...
Convert to string to fix runtime error due to string concat in self.common_args += ["-o", "User="+self.user] when ansible_ssh_user is numeric
2014-05-13 11:29:19 +02:00
James Cammarata
41169666b0
Merge pull request #7373 from sivel/issue/7367
...
Handle ValueError during json.loads of json data from build
2014-05-12 14:22:14 -05:00
Matt Martz
92b77048dc
Handle ValueError during json.loads of json data from build
2014-05-12 14:16:07 -05:00
Chris Church
d725636469
Correctly initialize combined_cache for hosts if setup is skipped
...
Fixes #7364
2014-05-12 13:48:11 -05:00
James Cammarata
38c2c60849
Do not base synchronize source on the inventory directory
...
Fixes #7366
2014-05-12 12:02:38 -05:00
James Cammarata
ba9ecb6ae6
Merge pull request #7371 from mwarkentin/devel
...
Retinafy favicon.ico
2014-05-12 11:12:38 -05:00
Michael Warkentin
998c8e438f
Retinafy favicon.ico
2014-05-12 11:29:45 -04:00
James Cammarata
a6a1e240c6
Merge pull request #7355 from itiut/add-dots-to-valid-path-chars
...
Add dots to valid path characters
2014-05-10 13:29:17 -05:00
Yuichi TANIKAWA
2b644da4ca
Add dots to valid path characters
2014-05-10 18:13:16 +09:00
James Cammarata
3bf890998b
Merge pull request #7348 from adamchainz/patch-2
...
Fix grammar and value errors in cron documentation
2014-05-09 22:27:31 -05:00
James Cammarata
fd27afdc0d
Adding ansible_shell_type and basic environment construction on it
...
Previously we assumed the shell on the target systems were 'sh'-
compliant when formatting environment variables preceding command
strings. This patch corrects that by basing the target shell type
on the DEFAULT_EXECUTABLE setting, which can be overridden on a
per-host basis using the inventory variable 'ansible_shell_type'.
Fixes #7352
2014-05-09 16:29:56 -05:00
James Cammarata
62c4a15c73
Merge pull request #7346 from tongpu/devel
...
Add documentation for required parameter name to quantum_subnet
2014-05-09 16:21:28 -05:00
Michael DeHaan
f247b93212
Add the start of a graphviz doc to illustrate variable precedence graphically.
2014-05-09 17:13:01 -04:00
James Cammarata
7c3dbd3cc6
Merge pull request #7350 from discordianfish/remove-ghost-state
...
Fix: Remove check for Ghost state
2014-05-09 13:15:26 -05:00
Johannes 'fish' Ziemke
ea71c0c317
Fix: Remove check for Ghost state
...
This fixed the just committed change handling non existent Ghost state.
2014-05-09 20:13:25 +02:00
James Cammarata
c97dec9d75
Merge pull request #7338 from discordianfish/remove-ghost-state
...
Remove check for Ghost state
2014-05-09 13:06:16 -05:00
James Cammarata
272db903e5
Adding an integration test for variable precedence
2014-05-09 11:42:57 -05:00
Johannes 'fish' Ziemke
b9d9ef511f
Remove check for Ghost state
...
This doesn't exist anymore and causes ansible to throw a KeyError
2014-05-09 18:07:02 +02:00
Adam Chainz
3497582581
Fix grammar and value errors in cron documentation
2014-05-09 15:19:42 +01:00
James Cammarata
b78058022d
Merge pull request #7342 from herbygillot/rds-params-fix
...
rds module: Fix undeclared reference to "params" when setting password in modify mode
2014-05-09 08:34:16 -05:00
Lukas Grossar
0aa4cb9a79
Add documentation for required parameter name to quantum_subnet
2014-05-09 15:17:04 +02:00
Michael DeHaan
54ac0fe92c
Merge pull request #7343 from lberruti/alternatives_python5_2
...
Make alternatives module python 2.5 compatible
2014-05-09 09:08:34 -04:00
James Laska
4ee0898fc9
Assert the MOCK_CFG exists for the mock-rpm build target
2014-05-09 09:01:44 -04:00
Herby Gillot
efbe4ca8d5
rds module: Fix undeclared reference to "params" when setting password in
...
modify mode.
2014-05-09 05:49:11 -04:00
James Cammarata
5c7109b8b9
Merge pull request #7110 from orgoj/docker-patch-version_comment
...
module docker - add docker version comment
2014-05-09 00:57:41 -05:00
James Cammarata
c5dea0f062
Merge branch 'jjshoe-devel' into devel
2014-05-09 00:32:41 -05:00
James Cammarata
a18f4b6230
Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel
2014-05-09 00:31:39 -05:00
James Cammarata
9b9b4d50fe
Merge pull request #7058 from jkleckner/fix-vars_prompt-when-default-False
...
Fix #7057 missing False default for vars_prompt
2014-05-09 00:29:31 -05:00
James Cammarata
0215134907
Fixing a doc mistake in the ec2 module from 4269bb6
2014-05-09 00:21:35 -05:00
James Cammarata
8b96a9cf72
Merge branch 'sayap-ec2-start-stop' into devel
2014-05-09 00:17:00 -05:00
James Cammarata
48e2a5e5a2
Merge branch 'ec2-start-stop' of https://github.com/sayap/ansible into sayap-ec2-start-stop
2014-05-09 00:04:34 -05:00
Yap Sok Ann
4269bb6a45
ec2: Fix bug with running/stopped state and wait=yes.
...
If `get_all_instances` returns multiple reservations, the old wait loop only
dealt with the first reservation. Thus, the wait loop may end before all
instances get to be running/stopped.
Also clean up the code a little.
2014-05-09 11:35:48 +08:00
James Cammarata
9d3583cab3
Merge pull request #7055 from bpennypacker/rds_modify
...
cloud/rds : renaming an rds instance always fails
2014-05-08 21:10:47 -05:00
James Cammarata
5c18af1afa
Merge branch 'orgoj-docker_image-patch-notag' into devel
2014-05-08 21:05:19 -05:00
James Cammarata
ebac5dfbce
Updating docstring for docker_image based on new default for tag
2014-05-08 21:04:55 -05:00
James Cammarata
34e52c5884
Merge branch 'docker_image-patch-notag' of https://github.com/orgoj/ansible into orgoj-docker_image-patch-notag
2014-05-08 21:03:57 -05:00
James Cammarata
f426bf5bd1
Merge branch 'bibliotechy-git-submodule-when-recursive-true' into devel
2014-05-08 20:58:38 -05:00
James Cammarata
8dd91021f4
Merge branch 'git-submodule-when-recursive-true' of https://github.com/bibliotechy/ansible into bibliotechy-git-submodule-when-recursive-true
2014-05-08 20:47:10 -05:00
James Cammarata
e35fe17eef
Merge branch 'jimbydamonk-elb_subnets' into devel
2014-05-08 19:32:39 -05:00
James Cammarata
39433949e0
Merge branch 'elb_subnets' of https://github.com/jimbydamonk/ansible into jimbydamonk-elb_subnets
2014-05-08 19:28:54 -05:00
James Cammarata
4358c846a0
Merge branch 'brian-brazil-devel' into devel
2014-05-08 16:47:21 -05:00
James Cammarata
b97f087f18
Fixing a typo in the monit module (status and not status())
2014-05-08 16:46:32 -05:00
James Cammarata
a969941b85
Merge branch 'devel' of https://github.com/brian-brazil/ansible into brian-brazil-devel
2014-05-08 16:11:18 -05:00
James Cammarata
d9bb1a480a
Merge pull request #7013 from orgoj/replace-patch-changed
...
module replace - report changed only if contents is changed
2014-05-08 15:14:19 -05:00
James Cammarata
8f9e7e0e7e
Merge branch 'ebrevdo-vpc_fix' into devel
2014-05-08 15:10:49 -05:00
James Cammarata
3ac4943751
Some cleanup for the rds/vpc_security_groups fix
2014-05-08 15:08:43 -05:00