cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6181 commits 47 branches 390 tags 440 MiB
Commit graph

1546 commits

Author SHA1 Message Date
Toshio Kuratomi
e95c0b2df3 Only split on the first colon. 
Fixes #1214
 2015-04-28 08:33:50 -07:00
zimbatm
34378b6c6a ec2_group: prioritise current VPC group names over others 2015-04-28 10:19:20 +01:00
zimbatm
8a4d5856ce ec2_group: select own group if the name matches 
This fixes an issue where multiple VPC have the same group name and
the one from the other VPC is selected.
 2015-04-27 19:26:13 +01:00
Brian Coca
78de8bbd99 removed unused and undefined aws_regions 2015-04-27 12:38:57 -04:00
Brian Coca
e137aea5d3 Merge pull request #1195 from bcoca/ec2_scaling_policy_fix 
removed redundant region def
 2015-04-27 12:34:59 -04:00
Martin Froehlich
4bcbcc8869 Use get_aws_connection_info to get AWS creds. 
Previously used get_ec2_creds did not consider security_token,
making MFA requests fail.
 2015-04-26 14:50:07 +01:00
Brian Coca
0e23dd6c55 avoid exception when boto is not available 2015-04-24 11:03:36 -04:00
Brian Coca
a905edd536 removed redundant region def 2015-04-24 08:54:56 -04:00
David Shrewsbury
c451fbdd61 Update os_server_volume for latest shade 
The shade volume API was updated to return a dict rather than the
object as returned by cinder.
 2015-04-23 10:52:08 -04:00
David Shrewsbury
f4600edeb8 Update os_volume for latest shade 
The shade volume API was updated to return a dict rather than the
object as returned by cinder.
 2015-04-23 10:37:43 -04:00
Chris Meyers
c66de51b16 better timeout logic when deleting vm disks. Python 2.4 safe excepts 2015-04-22 17:57:37 -04:00
Chris Meyers
797a617a1d correctly delete disks associated with vms 2015-04-22 17:04:35 -04:00
Brian Coca
178d3ea133 minor doc fixes 2015-04-22 16:40:59 -04:00
Brian Coca
b0cf0ae912 Merge pull request #1056 from emonty/feature/os_server_facts 
Add OpenStack Server facts module
 2015-04-22 15:21:40 -04:00
Brian Coca
70e24f1f4d Merge pull request #540 from lander2k2/hosted_service 
azure check for hosted service and vm before creating
 2015-04-22 11:07:29 -04:00
Brian Coca
8ce2a18921 Merge pull request #1184 from bobby/ec2_vpc-without-subnets 
Fixes regression introduced by edf1ac1ea6
 2015-04-21 15:17:44 -04:00
Bobby Calderwood
98a9f2d5b8 Fixes regression introduced by edf1ac1ea6 2015-04-21 14:56:46 -04:00
mcameron
6498303786 Net_id already present, remove unnecessary lookup. 2015-04-21 13:22:04 +01:00
mcameron
cb2ba9fe31 Valodate fip is on the correct network 2015-04-21 13:21:56 +01:00
bw-will-usher
0846de2cd5 Fixed MS SQL port number in documentation (1443->1433) per: https://support.microsoft.com/en-us/kb/287932 2015-04-21 07:59:05 -04:00
mcameron
394152f4ac Adding openstack multiregion support 2015-04-21 11:46:38 +01:00
Brian Coca
7255968f96 Merge pull request #1167 from romain-dartigues/issue1161_digitalocean 
Issue #1161 DigitalOcean API 2 ssh_key_ids problem
 2015-04-20 19:08:04 -04:00
Brian Coca
750ca8f4d3 Merge pull request #1173 from sky-shiny/os_nova_list_addresses 
Os nova list addresses
 2015-04-20 10:33:24 -04:00
Andrey Trubachev
1c8a8e8900 Fix mess of ipv6 and ipv4 addresses in private_ip 2015-04-20 15:28:56 +01:00
Romain Dartigues
3c848289a0 Issue #1161 DigitalOcean API 2 ssh_key_ids problem 
* fix documentation: show a valid syntax
* make ssh_key_ids a list and not a string
 2015-04-19 19:25:15 +02:00
Brian Coca
be89a2f5fc added new ec2_ami_find as per #905 2015-04-16 15:39:26 -04:00
Brian Coca
5e1224c4a8 deprecated ec2_ami_search 2015-04-16 15:39:26 -04:00
sisso
34d6d6f777 fixed bug where scaling policy return a random policy if many autoscale group have policies with same name. 2015-04-16 14:36:26 -03:00
Brian Coca
89bd6af0ed Merge pull request #966 from jnsaff/devel 
Added support for tagging images in ec2_ami.py
 2015-04-16 11:35:37 -04:00
David Shrewsbury
c241296a20 Update os_subnet module for latest shade 
Shade can now handle creating, updating and deleting subnets.
This cleans up the module to take advantage of that.
 2015-04-16 09:19:29 -04:00
David Shrewsbury
b854a28dfb Rename os_subnet to os_subnet.py 2015-04-16 09:17:57 -04:00
Jan Brauer
fcea4e1884 Add missing comma 2015-04-10 19:05:57 -04:00
Daekwon Kim
7684059044 Fix indent of "register" key 2015-04-09 19:10:49 +09:00
Daekwon Kim
88639ae8be Fix typo (volue -> volume) 2015-04-09 19:09:42 +09:00
Brian Coca
3b9756e0cd minor doc fixes 2015-04-08 03:20:28 -04:00
David Shrewsbury
4a233a5a8f Recognize when volume attach/detach is not necessary 
Do not attempt to attach an already attached volume.
Likewise, do not attempt to detach a volume that is not
attached.

This version adds support for check mode.
 2015-04-07 14:37:06 -04:00
Heikki Partanen
91ca2d6386 Add support for extra_hosts to docker module 
extra_hosts parameter (maps to --add-host in 'docker run' syntax) is used
to add host-to-ip mappings to the container.
 2015-04-07 10:30:14 +03:00
Kyle Johnson
86ed1cd0a9 Fix typo in rds_subnet_group.py 
aws_connection_kwargs should be aws_connect_kwargs
 2015-04-06 10:00:17 -04:00
Sam Kottler
7e1d63136f Merge pull request #998 from linefeedse/digitalocean-user-data 
DigitalOcean API version 2 with user_data option
 2015-04-05 15:26:54 -04:00
Brian Coca
4d9ce9cf2c Merge pull request #1032 from jder/fix-rds-vpc-groups 
Update rds module for RDS2 parameter name change.
 2015-04-03 20:24:33 -04:00
Matt Martz
1e94fc5ab5 Don't use a dict comprehension, be more verbose 2015-04-03 16:35:16 -05:00
Brian Coca
c01a18d5ca minor docfixes 2015-04-02 21:07:41 -04:00
Brian Coca
eed47383e4 Merge pull request #1040 from emonty/feature/os_auth 
Add OpenStack Auth module
 2015-04-02 20:51:53 -04:00
Jesse Rusak
030703f4ca Update rds module for RDS2 parameter name change. 
boto's rds2 renamed `vpc_security_groups` to `vpc_security_group_ids`
and changed from a list of `VPCSecurityGroupMembership` to just a
list of ids. This accommodates that change when rds2 is being used.
 2015-04-02 15:32:12 -04:00
steenzout
d960dc1584 issue #994: use HAS_BOTO to determine if import was successful: 
- removed import of sys module.
- HAS_BOTO constant to check if import was successful.
- trigger a failure when import fails.
- removed unnecessary imports.
 2015-04-01 17:31:10 -06:00
Eric Johnson
07a694647b Merge pull request #1010 from richtier/gc_storage_upload_headers 
gc_storage allow setting headers
 2015-04-01 13:32:22 -07:00
Richard Tier
9aa8879f0f added version to docstring 2015-04-01 21:01:00 +01:00
Monty Taylor
d7e65eab41 Add OpenStack Volume module 2015-03-31 19:42:41 -04:00
Monty Taylor
5d7b6aae04 Add OpenStack Subnet module 
Also deprecated old quantum_subnet module
 2015-03-31 19:42:09 -04:00
Monty Taylor
f6cf1411a1 Add OpenStack Server Volume module 2015-03-31 19:41:44 -04:00
Monty Taylor
cb6ebb1c03 Add OpenStack Server facts module 2015-03-31 19:41:17 -04:00
Monty Taylor
c9f1e441f5 Add OpenStack Auth module 
Use this to pre-auth or to get a copy of the service catalog.
 2015-03-31 19:32:05 -04:00
Ash Wilson
45b067f097 Record facts for each changed container. 2015-03-31 16:14:16 -04:00
Brian Coca
e6e3ade6fa added support for postgres9.4 which is now available from amazon 2015-03-31 11:46:54 -04:00
Brian Coca
613961c592 really fixed docs this time 2015-03-31 09:15:20 -04:00
Brian Coca
99391f861d fixed doc issues on cloudformation 2015-03-31 09:09:43 -04:00
Rob Johnson
ea1ffc6d19 allow both template and template_url parameters 2015-03-30 15:27:03 +01:00
Brian Coca
d27df0cdb4 Merge pull request #334 from adamchainz/cloudformation_dont_always_need_template 
Make cloudformation module's template argument not required in case of stack deletion
 2015-03-30 08:56:56 -04:00
Brian Coca
1865ddbbdf Merge pull request #339 from lorin/instance_id 
ec2 module: add instance_id alias
 2015-03-30 08:49:07 -04:00
Mick Bass
7de97864be clean rebase of https://github.com/ansible/ansible-modules-core/pull/1024 on a new branch 2015-03-29 21:56:44 -06:00
Brian Coca
8c80900fef removed requirements/boto as it broke documentation as it is duplicated in shared aws fragements 2015-03-29 17:08:08 -04:00
Brian Coca
adfcfa4b58 Merge pull request #318 from preo/ec2-group-empty-rules 
Allow empty EC2 Security Group rules.
 2015-03-29 10:26:33 -04:00
Brian Coca
feb5144c71 Merge pull request #1021 from defionscode/s3_conn 
allow boto profile use with s3
 2015-03-29 10:08:54 -04:00
Adam Chainz
8a4e7e5d9f Make cloudformation module's template argument not required in case of stack deletion 2015-03-29 09:31:13 +01:00
Kohei YOSHIDA
8ab812c242 support secure connection on fakes3 2015-03-28 23:31:53 +09:00
Jonathan Davila
611165a77e allow boto profile use with s3 2015-03-28 10:17:12 -04:00
Lorin Hochstein
ea4d5798c7 Use the correct alias syntax 2015-03-28 09:31:52 -04:00
Lorin Hochstein
e759b4d0eb ec2 module: add instance_id alias 
Create an alias named instance_id for the instance_ids parameter.
 2015-03-28 09:31:52 -04:00
Ryan Trauntvein
5320cc93e6 Specify that "state: reloaded" was added in Ansible 1.9 2015-03-27 16:36:10 -07:00
Scott Miller
13d420ebee describe choices in alias documentation 2015-03-27 16:20:20 -04:00
Brian Coca
f3e4704d92 Merge pull request #569 from 47lining/rate-throttling-retries-update 
add retry with exponential backoff when we receive throttling error code...
 2015-03-27 08:21:09 -04:00
Mick Bass
64a2077787 Add support for AWS Security Token Service (temporary credentials) to all AWS cloud modules. 2015-03-26 22:44:56 -06:00
Richard Tier
04c1927300 allow setting header 2015-03-26 23:02:35 +00:00
Brian Coca
eacf4e4239 Merge pull request #269 from SDFE/rds_subnet_group_params 
use aws connect call in rds_subnet_group that allows boto profile use
 2015-03-26 15:53:33 -04:00
Toshio Kuratomi
7e7eafb3e3 Make lack of boto call fail_json instead of sys.exit 
Fixes #994
 2015-03-26 12:12:39 -07:00
Brian Coca
5d776936cc Merge pull request #256 from SDFE/route53_connect_params 
Use aws connect calls that allow boto profile use
 2015-03-26 14:34:24 -04:00
Brian Coca
68daec05f2 Merge pull request #254 from SDFE/ec2_vpc_connect_params 
use simpler ec2_connect ec2 util call
 2015-03-26 14:17:27 -04:00
Brandon W Maister
efa4d04284 Make cache_subnet_group default to empty security groups 
Since they can't be specified together, it seems like setting the
default to no security groups is the right option.
 2015-03-26 13:56:46 -04:00
Brandon W Maister
3cb2346312 Add cache_subnet_group to elasticache module 
According to the [docs] cache subnet groups are required inside a VPC.

[docs]: http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheSubnetGroups.html
 2015-03-26 13:56:46 -04:00
Brian Coca
0771dd12ca Merge pull request #1004 from bcoca/s3_fixes 
S3 fixes
 2015-03-26 12:39:36 -04:00
Brian Coca
e5ed49d6c7 added patch to workaround some s3 connection faliures 2015-03-26 11:23:32 -04:00
Tor Åke Fransson
360409cee8 Merge remote-tracking branch 'origin/devel' into digitalocean-user-data 
Conflicts:
	cloud/digital_ocean/digital_ocean.py
 2015-03-26 14:05:57 +01:00
Tor Åke Fransson
3f17ec489b Remove all reference to obsolete client_id and rename api_key to the for v2 more correct api_token 2015-03-26 13:56:39 +01:00
Tor Åke Fransson
41875984e5 Make digital_ocean ssh command use API v2 2015-03-26 09:57:35 +01:00
Brian Coca
f6c9d555a0 Merge pull request #976 from jsmartin/asg_doc_fix 
Re-wording of feature.
 2015-03-25 22:12:35 -04:00
Brian Coca
6570d48657 refactrored connection exception handling, added check to see if we actually get a connection before proceeding 
Fixes #964
 2015-03-25 21:40:13 -04:00
Brian Coca
79844506db Merge pull request #341 from axilleas/digitalocean_docs 
digital_ocean: Add note about using API v1
 2015-03-25 15:16:03 -04:00
Tor Åke Fransson
69911ec86e WIP: DigitalOcean API version 2 with user_data option 2015-03-25 16:43:11 +01:00
Toshio Kuratomi
9464277f4f Merge pull request #993 from smashwilson/docker-deployed-by-image 
[docker] Compare container's configured image instead of running image
 2015-03-24 12:55:33 -07:00
Ash Wilson
9ce2fc718a Only fetch details when necessary. 2015-03-24 11:18:15 -04:00
Ash Wilson
47f4c3f2e5 Compare container images to Config.Image. 2015-03-24 11:07:12 -04:00
Sarah Zelechoski
43cd4ebd2e fix syntax in last example 2015-03-24 10:31:34 -04:00
James Martin
3bd2b7c8aa Re-wording of feature. 2015-03-20 14:59:34 -04:00
Toshio Kuratomi
5399f3744f Fix review comments from @bcoca in #745 2015-03-20 09:52:19 -07:00
Toshio Kuratomi
9e9fa6a451 Merge branch 'fix-ec2_asg' of https://github.com/m-o-e/ansible-modules-core into m-o-e-fix-ec2_asg 2015-03-20 09:43:05 -07:00
Toshio Kuratomi
a78de50801 Minor code formatting 2015-03-19 22:38:06 -07:00
Rowan Wookey
37412219d5 Fixed group name not being passed to wait_for_new_instances when replacing instances 
Fixed group_name not being passed to wait_for_elb
Minor code clean up
 2015-03-19 22:38:06 -07:00
James Martin
1c96ff32a1 check lb for instance healthy and some refactoring of rolling replace functions. 
Optionally waiting for new instances to be in viable state on ASG creation/update.

Properly updating properties and terminating group.
 2015-03-19 22:38:06 -07:00
Toshio Kuratomi
fb1c92ffa4 Merge pull request #724 from ferrants/devel-metric_alarm_fix 
check keys is in dim2 before evaluating
 2015-03-19 12:46:43 -07:00
Brian Coca
5641b1ff73 undeprecated openstack modules as new ones are not making into release 2015-03-19 15:15:17 -04:00
moncho
3421712e05 Update docker.py 
Fix typo that prevents use_tls 'encrypt' option from working properly.
 2015-03-19 19:30:36 +01:00
Jaanus Torp
aca893cf43 Added support for tagging images in ec2_ami.py 2015-03-19 15:39:42 +00:00
Eric Johnson
c7381a92b8 Merge pull request #956 from rmarsagoogle/gce_net 
Added multiple allowed ranges.
 2015-03-19 06:09:18 -07:00
Toshio Kuratomi
76198a8223 Merge pull request #961 from nemunaire/fix-docker-version-print 
[docker] Fix formating error when remote host doesn't have required version
 2015-03-18 19:51:45 -07:00
Toshio Kuratomi
e338fef730 Add another valid status from downloading images 2015-03-18 18:27:01 -07:00
nemunaire
fce8c21176 Convert tuple items to string before format 2015-03-18 14:37:26 +01:00
Robert Marsa
74e94f2712 Added multiple allowed ranges. 2015-03-17 13:49:53 -07:00
Julien Syx
23fdba26b5 Fix the issue #931 
Checking that the parameter doesn't exist. The old code had a bug when the parameter was 0.
 2015-03-17 17:57:18 +01:00
Toshio Kuratomi
8658b82de7 Some code cleanup (removed unused variables and imports) 2015-03-16 11:58:03 -07:00
Toshio Kuratomi
34c4e0d495 Also use DOCKER_TLS_VERIFY env var to turn on tls verification 2015-03-16 11:43:52 -07:00
Toshio Kuratomi
ceda82603a Merge pull request #947 from ansible/docker-tls-none 
When no use_tls is not specified and no tls parameters are given we need to not attempt tls.
 2015-03-16 11:29:14 -07:00
Toshio Kuratomi
b0d194ea94 Fix a potential bug in docker pull 2015-03-15 11:22:07 -07:00
Toshio Kuratomi
d65d04b3f8 Merge pull request #904 from ansible/ec2_vpc-sort 
Sort subnets by the order they are specified in the play
 2015-03-15 11:19:07 -07:00
Toshio Kuratomi
5b4d7a2182 When no use_tls is not specified and no tls parameters are given we need to not attempt tls. 2015-03-14 22:59:17 -07:00
Alex Rowley
7d6cd3baaa cloud/amazon/s3: update documentation 
update description to show that module can do more than just put files into s3
 2015-03-13 21:08:30 +00:00
Toshio Kuratomi
45637176dc Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from 
Remove volumes_from altogether

Conflicts:
	cloud/docker/docker.py
 2015-03-13 13:42:40 -07:00
Toshio Kuratomi
e4a5b46cfb Merge pull request #936 from ansible/docker-pid-mode 
Make pid_mode parameter do minimum docker-py/docker server version checks
 2015-03-13 11:50:46 -07:00
Toshio Kuratomi
81fc92bd66 Make state=running work for backwards compatibility with 1.8 2015-03-13 10:23:10 -07:00
Toshio Kuratomi
bddd02bfcb Fix lookup of parameter name to be pid instead of pid_mode 2015-03-13 07:31:55 -07:00
Toshio Kuratomi
9d0d54b9a6 Merge pull request #926 from ansible/docker-tls-alt-854 
Alternative implementation of tls for docker
 2015-03-12 23:41:28 -07:00
Toshio Kuratomi
cf9374f3ea Make pid_mode parameter do minimum docker-py/docker server version checks 2015-03-12 22:53:31 -07:00
Toshio Kuratomi
3a6cc86578 Fix for problems found by @dguerri 
* TLSConfig['verify'] has to be set to False if we're only encrypting the
  connection, not verifying the host.
* tls_hostname was not set if tls_ca_cert was not present

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78573877
 2015-03-12 12:53:48 -07:00
Toshio Kuratomi
1add8ed9e5 Implement comments from @smashwilson: 
* if tls_ca_cert is set then use tls to verify the server
* take tls_hostname from the environment variable DOCKER_TLS_HOSTNAME
  if it's not specified in the playbook

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78542210
 2015-03-12 11:07:22 -07:00
Ian Babrou
763f472f5b fixed: global name 'e' is not defined 2015-03-12 11:04:50 +03:00
Toshio Kuratomi
3e0cbc82f1 Alternative implementation of tls for docker 
Alternative to #854
 2015-03-11 20:37:27 -07:00
Toshio Kuratomi
31cc5f543f Fix for py2.6 (no dict comprehensions on py2.6) 2015-03-11 19:07:55 -07:00
Toshio Kuratomi
8ed415589a Initialize the value of vpc_id variable 2015-03-11 18:40:05 -07:00
Brian Coca
07d5b50e2c Merge pull request #903 from h3biomed/allow_default_subnet 
Allow vpc_subnet_id to remain unspecified (see bc0c169)
 2015-03-11 14:46:59 -04:00
Brian Coca
df835f8be9 Merge pull request #924 from hkariti/route53_public_zones 
Fix KeyError in public zones in route53
 2015-03-11 13:57:33 -04:00
Toshio Kuratomi
974075277d Also don't fail if files are different and overwrite is false for uploads (this mimics copy and template). 
Related to #489
 2015-03-11 08:59:38 -07:00
Hagai Kariti
d65f9aa3af Fix KeyError in public zones in route53 2015-03-11 17:30:20 +02:00
Toshio Kuratomi
ca32205c7b Documentation style changes 2015-03-11 08:26:16 -07:00
Toshio Kuratomi
47c6dae9f3 Merge pull request #490 from pgehres/devel 
Issue #489: s3 should not fail on checksum mismtach when overwrite=no
 2015-03-11 08:22:23 -07:00
Matt Martz
a4e65e8e6e Prevent an empty error message 2015-03-10 11:30:14 -05:00
Ian Babrou
9ecfde7551 not triggering reload for links and not string env variables 2015-03-09 22:49:00 +03:00
Ash Wilson
0969fd75c8 Use {0}, {1} style format indices for 2.6 compat 2015-03-09 12:54:22 -04:00
Ash Wilson
19664a96db Expect module env vars to override Dockerfile ones. 2015-03-09 12:17:39 -04:00
Ash Wilson
608ddbea29 Include bind mounts in VOLUMES check. 2015-03-09 11:20:14 -04:00
Ash Wilson
2c58eb3845 Exposed ports, env vars, volumes from the image. 
This will account for settings that are provided by the hierarchy of
Dockerfiles used to construct your image, rather than only accounting
for settings provided to the module directly.
 2015-03-09 10:32:10 -04:00
Ash Wilson
79db475316 Full image inspection and just repo tags 
Hat tip to @bobrik.
 2015-03-09 10:05:56 -04:00
Brian Coca
1c0623ab8d Merge pull request #890 from SamYaple/docker-pid-support 
Add pid mode support to docker module
 2015-03-07 20:27:42 -05:00
Ash Wilson
d046425049 Connect to Docker with optional TLS. 2015-03-06 18:04:36 -05:00
Ash Wilson
80aca4b936 Rework docker module states. 
Organize each state into a distinct function for readability and composability.
Rework `present` to create but not start containers. Add a `restarted` state
to unconditionally restart a container and a `reloaded` state to restart a
container if and only if its configuration is incorrect. Store our most recent
knowledge about container states in a ContainerSet object. Improve the value
registered by this task to include not only the inspect data from any changed
containers, but also action counters in their native form, a summary message
for all actions taken, and a `reload_reasons` key to store a human-readable
diagnostic to determine why each container was reloaded.
 2015-03-06 17:58:11 -05:00
Ash Wilson
7490223940 Pull newer image versions when requested. 2015-03-06 17:56:45 -05:00
Ash Wilson
fedbea682e Another documentation commit. 2015-03-06 17:56:37 -05:00
Toshio Kuratomi
edf1ac1ea6 Sort subnets by the order they are specified in the play 
Fixes #172
 2015-03-06 14:55:11 -08:00
Bret Martin
f16d8d9afb Allow vpc_subnet_id to remain unspecified (see bc0c169) 2015-03-06 14:59:27 -05:00
Sam Yaple
e1e74bdf33 Updated version and fixed default 2015-03-06 03:13:55 -06:00
Lev Popov
a15cce2d7f Allow to keep instance boot disk after instance deletion in google cloud module 2015-03-04 09:41:03 +01:00
Sam Yaple
74e922449b Add pid mode support to docker module 
This allows setting the pid namespace for a container. Currently only
the 'host' pid namespace is supported.

This requires Docker 1.4.1 and docker-py 1.0.0
 2015-03-03 23:32:15 -06:00