Commit graph

778 commits

Author SHA1 Message Date
James Cammarata
5eea0d0f0c Merge branch 'vpc_fix' of https://github.com/ebrevdo/ansible into ebrevdo-vpc_fix 2014-05-08 14:39:07 -05:00
napkindrawing
6bda82c907 Fix to unescape * was discarded by unescape of @
`decoded_name` was created twice, each from `rset.name`

So, the second call to `.replace(r'\100', '@')` overwrites decoded_name, discarding the result of the call to `.replace(r'\052', '*')`

I had a problem with wildcard domains that was fixed by this patch.
2014-05-08 14:20:32 -04:00
James Cammarata
eb61c3737c Make sure the default ec2_group egress rule is not removed
Upon a second run, the default egress rule will be removed when a
vpc is specified but no other egress rules were set. This patch
corrects that behavior by removing the default egress rule from the
list of unmatched outbound rules.

Fixes #7309
2014-05-07 20:52:03 -05:00
Maykel Moya
da5204e58b Fix typo 2014-05-07 10:35:16 +02:00
James Cammarata
4b2a56fb03 Fixing two bugs in the ec2_elb_lb module
* the current state of the ELB was not reflected properly when checking
  the status after a change was made.
* invalid zones caused a traceback when enabling/disabling zones
2014-05-05 12:48:45 -05:00
James Cammarata
19a77228d3 Removing zone choices that overly-limit available zones for gce
Fixes #7270
2014-05-05 11:58:39 -05:00
James Cammarata
b08ce87429 Merge pull request #7230 from binarytemple/fix_for_issue_7228
fix issue #7228 ec2_vol crash
2014-04-30 08:30:27 -05:00
bryan hunt
9fe00396ab fix issue #7228 ec2_vol crash 2014-04-30 10:43:05 +01:00
Atlas Health
4e4d4370c1 added example 2014-04-29 17:13:25 -04:00
Atlas Health
eba4d83827 updated docs to include snapshot_tags option
added version
2014-04-29 17:13:25 -04:00
James Cammarata
ba06269655 Merge branch 'patch-2' of https://github.com/budlight/ansible into budlight-patch-2 2014-04-29 15:58:05 -05:00
Michael DeHaan
de3f7e4225 Merge pull request #6794 from follower/patch-4
Make `vpc_security_group` docs more accurate
2014-04-29 15:49:57 -04:00
James Cammarata
3d9c5ceafd Merge pull request #7212 from jimi-c/issue_7027_ec2_group_egress_rules
Make sure a default allow out rule exists if no other egress rules do
2014-04-29 10:39:36 -05:00
James Cammarata
09e675290a Merge pull request #7190 from jimi-c/issue_7180_vsphere_guest_hardware_variable_casts
Make sure values are integers for certain hardware items for vpshere_guest
2014-04-28 21:00:46 -05:00
James Cammarata
2b3d39ddd3 Merge branch 'elb' of https://github.com/bpennypacker/ansible into bpennypacker-elb 2014-04-28 20:39:10 -05:00
James Cammarata
075c3bcfa3 Make sure values are integers for certain hardware items for vpshere_guest
Fixes #7180
2014-04-28 11:40:00 -05:00
Ben Holloway
0830d9eed5 documentation fix 2014-04-24 17:58:39 -06:00
Ben Holloway
c20f6b58c7 attempt to set availability_zones to all if neither availability_zones or vpc_identifier are set 2014-04-24 17:56:26 -06:00
Bruce Pennypacker
8baeccacab removed unwanted 'if wait else None' 2014-04-24 20:41:51 +00:00
Ben
008905f58d documentation fix availability_zones should be required for ec2_asg 2014-04-24 11:56:25 -06:00
Ben
834115290d updated example to include instance_type 2014-04-24 11:50:49 -06:00
Ben
06ff535098 Added instance_type to ec2_lc variable list 2014-04-24 11:47:41 -06:00
James Cammarata
404412f254 Fixing the version_added string in the vsphere_guest module 2014-04-23 22:46:14 -05:00
James Cammarata
6aaf249847 Merge branch 'vmware_core' of https://github.com/rhoop/ansible into rhoop-vmware_core 2014-04-23 21:12:40 -05:00
npeters
43ac7a7984 Remove invalid variable 2014-04-24 01:12:55 +02:00
James Cammarata
98d949e143 Merge pull request #7047 from joshuaconner/docker_bugfix_exclude_entrypoint_from_command_check
docker: exclude 'entrypoint' from comparing 'command' param with containers
2014-04-23 16:14:48 -05:00
Richard Hoop
2364ede3fc Author 2014-04-23 16:53:12 -04:00
James Cammarata
f068a4f26a Merge pull request #6991 from joshuaconner/bugfix_dont_send_wrong_params_to_dockerclient_start
Docker: don't send wrong parameters to client.start()
2014-04-23 15:48:04 -05:00
Richard Hoop
f6e6b313b7 Ready for pull request 2014-04-23 16:44:49 -04:00
Richard Hoop
f09ecf2239 Core complete 2014-04-23 15:26:03 -04:00
James Cammarata
3b78b05816 Merge pull request #6599 from dmage/nova_region_name
use region_name in nova_compute
2014-04-23 10:15:57 -05:00
James Cammarata
566a284186 Merge pull request #6985 from jimi-c/issue_6763_ec2_vpc_params
Ensure params were set in ec2_vpc before accessing them
2014-04-23 10:08:50 -05:00
Richard Hoop
149a740a1c Started reconfigured 2014-04-23 09:53:12 -04:00
Ted Timmons
118ed766e6 update documentation to include missing option
'list' was added more recently, it was omitted from the documentation.
2014-04-23 08:44:43 -05:00
Richard Hoop
b81d5d532e Creation complete 2014-04-22 17:12:23 -04:00
Richard Hoop
a956522363 More config checks and clean up for vm_config settings 2014-04-22 16:20:04 -04:00
Bruce Pennypacker
733508d07f Changed behavior of deregister. If an instance is not found in the ELB then simply return 'changed=false'. Otherwise always remove the instance from the ELB no matter what state its currently in. 2014-04-22 18:44:41 +00:00
Richard Hoop
3dca5d510a Large cleanups. Reintegrating all modules together for a guest 2014-04-21 16:38:31 -04:00
CaptTofu
45d2cab30c Small bug - 'acts' should be 'facts' 2014-04-21 08:06:00 -07:00
Joshua Conner
0ce43d6e3c docker: exclude 'entrypoint' from comparing 'command' param with containers
The JSON the Docker API returns includes the container's ENTRYPOINT value (if it has one) with the 'Command' value. So instead of checking if `container['Command'] == module.params['command']`, we just check that `container['Command'].endswith(module.params['command'])` so the entrypoint won't affect a container being properly classified as matching the module params or not.

Also I refactored a super-long `if` statement into some temporary variables - I did it to help me figure out what was going wrong, and then it makes the code more readable so I kept it.
2014-04-17 16:10:53 -07:00
Joshua Conner
bac2e879b2 docker: send 1.10 params if docker-py is new enough version 2014-04-17 16:05:50 -07:00
James Cammarata
10923b1c11 Make sure a default allow out rule exists if no other egress rules do
Fixes #7027
2014-04-17 15:24:18 -05:00
Matt Bray
afd0e78f16 docker.client.APIError has moved to docker.errors.APIError
see 18d4db09ec
2014-04-16 23:42:56 +01:00
James Cammarata
019c515a0b Check resource_tags value before using it in ec2_vpc
Fixes #7024
2014-04-16 12:21:32 -05:00
evanccopengeo
ab8f9544a6 cleaning up the code a bit more 2014-04-15 18:16:34 -04:00
evanccopengeo
2ab68cba0c fixing bug where if both private_ip and assign_public_p are set ansible fails out 2014-04-15 17:55:26 -04:00
Joshua Conner
6bf75de95c Docker: don't send wrong parameters to client.start()
As part of being updated for the 1.10 API, a couple of parameters were passed to the docker.client.start() command that it doesn't accept. This caused the module to error out if it tried to start any Docker containers. This removes those parameters so the module works again.
2014-04-14 15:05:42 -07:00
James Cammarata
af58d6e8f5 Ensure params were set in ec2_vpc before accessing them
Fixes #6763
2014-04-14 10:58:07 -05:00
Michael DeHaan
7fb26f43a3 Merge pull request #6956 from mattjbray/docker-1-10-volumes-from-dns
docker: from API 1.10 dns and volumes_from should be passed to start()
2014-04-14 11:29:10 -04:00
Michael J. Schultz
fb10556f3e cloud/elasticache: Ensure self.data is iterable
- self.data['SecurityGroups'] can return None causing traceback, if that
  is the case fallback to an empty list
2014-04-11 18:23:53 -05:00