Commit Graph

10525 Commits (4e93b37abcd8e4ac4cd2c091ae91ddbf6163136d)
 

Author SHA1 Message Date
James Cammarata 4e93b37abc Merge pull request #7393 from jimi-c/issue_7387_role_conditionals
Properly merge role conditionals in with pre-existing conditionals
11 years ago
James Cammarata 360ffc4dfd Properly merge role conditionals in with pre-existing conditionals
Fixes #7387
11 years ago
James Cammarata 19dbff916f Correctly cast the size_gb value for vpshere disks
Fixes #7385
11 years ago
James Cammarata 187619c7fe Use utils.combine_vars on vars_files data
Fixes #7345
11 years ago
James Cammarata 809b931640 Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir
Do not base synchronize source on the inventory directory
11 years ago
James Cammarata d75eb03080 Merge pull request #7380 from carsongee/cg/quantum_ip_subnet
Fix missing variable initialization so an unspecified internal_network works
11 years ago
James Cammarata e17afa06ef Merge branch 'marcore-devel' into devel 11 years ago
Carson Gee e6fbd2d8cb Fix missing variable initialization so an unspecified internal_network runs 11 years ago
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
11 years ago
James Cammarata 41169666b0 Merge pull request #7373 from sivel/issue/7367
Handle ValueError during json.loads of json data from build
11 years ago
Matt Martz 92b77048dc Handle ValueError during json.loads of json data from build 11 years ago
Chris Church d725636469 Correctly initialize combined_cache for hosts if setup is skipped
Fixes #7364
11 years ago
James Cammarata 38c2c60849 Do not base synchronize source on the inventory directory
Fixes #7366
11 years ago
James Cammarata ba9ecb6ae6 Merge pull request #7371 from mwarkentin/devel
Retinafy favicon.ico
11 years ago
Michael Warkentin 998c8e438f Retinafy favicon.ico 11 years ago
James Cammarata a6a1e240c6 Merge pull request #7355 from itiut/add-dots-to-valid-path-chars
Add dots to valid path characters
11 years ago
Yuichi TANIKAWA 2b644da4ca Add dots to valid path characters 11 years ago
James Cammarata 3bf890998b Merge pull request #7348 from adamchainz/patch-2
Fix grammar and value errors in cron documentation
11 years ago
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
11 years ago
James Cammarata 62c4a15c73 Merge pull request #7346 from tongpu/devel
Add documentation for required parameter name to quantum_subnet
11 years ago
Michael DeHaan f247b93212 Add the start of a graphviz doc to illustrate variable precedence graphically. 11 years ago
James Cammarata 7c3dbd3cc6 Merge pull request #7350 from discordianfish/remove-ghost-state
Fix: Remove check for Ghost state
11 years ago
Johannes 'fish' Ziemke ea71c0c317 Fix: Remove check for Ghost state
This fixed the just committed change handling non existent Ghost state.
11 years ago
James Cammarata c97dec9d75 Merge pull request #7338 from discordianfish/remove-ghost-state
Remove check for Ghost state
11 years ago
James Cammarata 272db903e5 Adding an integration test for variable precedence 11 years ago
Johannes 'fish' Ziemke b9d9ef511f Remove check for Ghost state
This doesn't exist anymore and causes ansible to throw a KeyError
11 years ago
Adam Chainz 3497582581 Fix grammar and value errors in cron documentation 11 years ago
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
11 years ago
Lukas Grossar 0aa4cb9a79 Add documentation for required parameter name to quantum_subnet 11 years ago
Michael DeHaan 54ac0fe92c Merge pull request #7343 from lberruti/alternatives_python5_2
Make alternatives module python 2.5 compatible
11 years ago
James Laska 4ee0898fc9 Assert the MOCK_CFG exists for the mock-rpm build target 11 years ago
Herby Gillot efbe4ca8d5 rds module: Fix undeclared reference to "params" when setting password in
modify mode.
11 years ago
James Cammarata 5c7109b8b9 Merge pull request #7110 from orgoj/docker-patch-version_comment
module docker - add docker version comment
11 years ago
James Cammarata c5dea0f062 Merge branch 'jjshoe-devel' into devel 11 years ago
James Cammarata a18f4b6230 Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel 11 years ago
James Cammarata 9b9b4d50fe Merge pull request #7058 from jkleckner/fix-vars_prompt-when-default-False
Fix #7057 missing False default for vars_prompt
11 years ago
James Cammarata 0215134907 Fixing a doc mistake in the ec2 module from 4269bb6 11 years ago
James Cammarata 8b96a9cf72 Merge branch 'sayap-ec2-start-stop' into devel 11 years ago
James Cammarata 48e2a5e5a2 Merge branch 'ec2-start-stop' of https://github.com/sayap/ansible into sayap-ec2-start-stop 11 years ago
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.
11 years ago
James Cammarata 9d3583cab3 Merge pull request #7055 from bpennypacker/rds_modify
cloud/rds : renaming an rds instance always fails
11 years ago
James Cammarata 5c18af1afa Merge branch 'orgoj-docker_image-patch-notag' into devel 11 years ago
James Cammarata ebac5dfbce Updating docstring for docker_image based on new default for tag 11 years ago
James Cammarata 34e52c5884 Merge branch 'docker_image-patch-notag' of https://github.com/orgoj/ansible into orgoj-docker_image-patch-notag 11 years ago
James Cammarata f426bf5bd1 Merge branch 'bibliotechy-git-submodule-when-recursive-true' into devel 11 years ago
James Cammarata 8dd91021f4 Merge branch 'git-submodule-when-recursive-true' of https://github.com/bibliotechy/ansible into bibliotechy-git-submodule-when-recursive-true 11 years ago
James Cammarata e35fe17eef Merge branch 'jimbydamonk-elb_subnets' into devel 11 years ago
James Cammarata 39433949e0 Merge branch 'elb_subnets' of https://github.com/jimbydamonk/ansible into jimbydamonk-elb_subnets 11 years ago
James Cammarata 4358c846a0 Merge branch 'brian-brazil-devel' into devel 11 years ago
James Cammarata b97f087f18 Fixing a typo in the monit module (status and not status()) 11 years ago