Commit graph

1956 commits

Author SHA1 Message Date
Toshio Kuratomi
4c622a0338 Another launchconfig field needs to be explicitly converted for json serialization
Fixes #1848
2015-08-06 08:41:23 -07:00
sebi
599d60efc0 mem_limit client version check 2015-08-06 16:46:01 +03:00
Brian Coca
016b4ede2e minor doc fix 2015-08-05 17:36:16 -04:00
Evan Carter
06e722900e Adding the ability to associate eips with network interfaces 2015-08-05 14:34:33 -04:00
Shobhit Srivastava
8ad072c96f checking remote_group_id while comparing os_security_group_rule 2015-08-04 12:52:56 +05:30
Brian Coca
762e43c50f Merge pull request #1860 from tedder/patch-1
fix ugly documentation
2015-08-03 12:56:04 -04:00
Toshio Kuratomi
1001eae3c8 Set a default value for DEFAULT_DOCKER_API_VERSION so we can create the AnsibleModule without docker-py 2015-08-03 08:44:48 -07:00
Ted Timmons
40519de8e7 fix ugly documentation
current version dumps a character per line in the docs: http://docs.ansible.com/ansible/cloudformation_module.html
2015-08-01 17:30:15 -07:00
Robert Jailall
d10f3f7a7e Refactor ec2_snapshot to make it more testable 2015-08-01 08:11:17 -07:00
Hagai Kariti
1f447ad5ba made wait default to True in ec2_snapshot 2015-08-01 07:54:15 -07:00
Hagai Kariti
a91db23b56 Add to the ec2_snapshot module the ability to create a snapshot only if one hasn't recently been created
- Added snapshot_max_age parameter
- Updated docs
- Made the default value of wait to be false, as it used to be
2015-08-01 07:54:15 -07:00
Toshio Kuratomi
42d3d02855 Merge pull request #51 from cewood/ec2-group/cidr-ip-list
Support specifying cidr_ip as a list
2015-08-01 07:45:38 -07:00
Toshio Kuratomi
be468ff9d3 result is now a dict and so needs different access syntax
Fixes #1848
2015-07-31 20:58:04 -07:00
Toshio Kuratomi
4928357667 Remove unneeded urllib2 import 2015-07-31 20:58:04 -07:00
Brian Coca
1268a83eb7 Merge pull request #1782 from civisanalytics/iam_dont_delete_passwords_silently
iam: don't delete passwords by default
2015-07-30 19:51:57 -04:00
James Cammarata
79f21c6ec9 Fix missing params to download_s3file in s3 2015-07-30 14:49:45 -04:00
Brian Coca
697307f88c Merge pull request #1670 from mikeputnam/issue-1643-gpl-header
Add missing GPLv3 License header
2015-07-30 14:39:44 -04:00
James Cammarata
4c4e978360 Fixing s3 failures when bucket names contain dots 2015-07-30 13:47:01 -04:00
Brian Coca
c6da9d0758 added missing version_Added to extra_hosts
fixes #1843
2015-07-30 13:05:00 -04:00
Brian Coca
d6b9989c71 Merge pull request #1820 from jaimegago/patch-1
Fix example indentation bug
i seem to have misread the patch, i thought it was doing the contrary of what it was. Sorry, merging it in now.
2015-07-30 09:52:00 -04:00
Toshio Kuratomi
2785364ebe Merge pull request #1736 from larsks/bug/docker-version-parse
docker: fix parsing of docker __version__ string
2015-07-29 12:36:37 -07:00
Cameron Wood (@cewood)
4241d940b7 Support specifying cidr_ip as a list
Update/fix to Support specifying cidr_ip as a list

Unicode isn't compatible with python2, so we needed some other
solution to this problem. The simplest approach is if the ip item
isn't already a list, simply convert it to one, and we're done.
Thanks to @mspiegle for this suggestion.
2015-07-29 19:11:43 +10:00
Brian Coca
49400d90ac Merge pull request #1830 from ecliptik/devel
Fix incorrect var name for api_version
2015-07-28 18:25:20 -04:00
Micheal Waltz
b43f236b05 Fix incorrect var name for api_version 2015-07-28 15:11:33 -07:00
Luke Rohde
88a0d79873 Use msg kwarg to pass error message in ec2_snapshot 2015-07-28 16:02:49 -04:00
Brian Coca
c579f53a15 Merge pull request #1818 from j2sol/no_ipv6_update_subnet
Handle non-updatable openstack subnet details
2015-07-28 15:00:30 -04:00
Brian Coca
92f32a0253 added version added to headers in s3 2015-07-28 14:50:39 -04:00
Brian Coca
8227b48a6a minor doc fixes 2015-07-28 14:50:01 -04:00
Brian Coca
4b78b5597f Merge pull request #160 from acaire/s3-headers
S3 headers
2015-07-28 14:48:51 -04:00
Jaime Gago
1f62f5f580 Fix example indentation bug 2015-07-27 23:40:49 -07:00
Brian Coca
cb90735b2a Merge pull request #1795 from feanil/feanil/s3_overwrite_early
If overwrite is set, download eagerly.
2015-07-27 22:34:58 -04:00
Brian Coca
dbdbcb33cc defined DEFAULT_DOCKER_API_VERSION to avoid it erroring out before we send the message that docker.py is missing 2015-07-27 22:33:15 -04:00
Brian Coca
44d23ababd Merge pull request #1767 from ecliptik/devel
Use proper HostConfig element which contains the proper Memory value …
2015-07-27 18:23:33 -04:00
Brian Coca
d91834bdf5 Merge pull request #1763 from larsks/bug/missing-mem-limit
restore mem_limit
2015-07-27 18:22:37 -04:00
Jesse Keating
84dfcf3690 Handle non-updatable openstack subnet details
Some things cannot be updated via the API, so check for those and fail
if the user is wanting to update them. Also don't try to update ipv6
stuff, as that doesn't work and will cause a traceback.
2015-07-27 14:54:29 -07:00
Brian Coca
f4a17b3e97 Merge pull request #1802 from bcoca/ec2_fixes
ec2 fixes
2015-07-27 15:48:02 -04:00
Toshio Kuratomi
8a9405a55b Convert object into dict so it will turn into json properly 2015-07-27 11:04:58 -07:00
Brian Coca
481f300836 clarified error messages to actually give back ansible module option instead of internal boto field name 2015-07-24 23:32:41 -04:00
Jens Carl
fd0fc5131c Fix missing alias "groups". 2015-07-24 22:06:56 +00:00
Feanil Patel
22461e335a If overwrite is set, download eagerly.
If the we are going to overwrite the file anyway,
there is no need to do any checksums locally or
grab the remote etag.
2015-07-24 10:44:05 -04:00
khassen
5f2b365faa Use the common/shared MD5 function. 2015-07-23 13:58:43 -07:00
Micheal Waltz
613fe54908 Use a if/else instead to avoid loading possibly invalid values for Memory 2015-07-23 12:17:26 -07:00
Micheal Waltz
77d1c896fe Set the API version when checking differences in containers and use
this to determine the location of the Memory value depending on the version used.

In v1.18 and earlier it was ['Config']['Memory'], but in v1.19 it
changed to ['HostConfig']['Memory'].
2015-07-23 11:34:33 -07:00
Brian Coca
c9b7043ee2 Merge pull request #1761 from jhaals/docker-read-only-container
Added support for --read-only Docker containers
2015-07-23 11:59:32 -04:00
Johan Haals
1ea03e7182 ensures API compatibility for read_only containers 2015-07-23 16:45:01 +02:00
Brian Coca
cfe697f676 Merge pull request #1775 from arcz/patch-1
Fix typos in route53.py
2015-07-22 16:47:18 -04:00
billwanjohi
99e3881a7c iam: don't delete passwords by default 2015-07-22 20:46:42 +00:00
Toshio Kuratomi
222927256d Remove validate_certs as the url is not user settable so we always want to validate the certificate 2015-07-22 07:09:51 -07:00
Artur Cygan
2133cb1171 Update route53.py
Fix typos
2015-07-22 11:36:32 +02:00
Johan Haals
851e55b55f changed version_added for read_only param
this feature will be released in 2.0
2015-07-22 08:28:16 +02:00
Johan Haals
8ec6538ad4 Merge remote-tracking branch 'upstream/devel' into docker-read-only-container 2015-07-22 08:27:35 +02:00
Baraa Basata
dc9dfa9ef8 Fix iam_policy example 2015-07-22 00:03:33 -04:00
Christian Hammerl
b96d304b93 docker: add support to add/drop capabilities 2015-07-21 19:34:24 -04:00
Brian Coca
92199342cd Merge pull request #1429 from flyinprogrammer/devel
[gce] [gce_net] fix docs; only delete network if fwname is not provided
2015-07-21 18:42:53 -04:00
Micheal Waltz
b0b1566b89 Use proper HostConfig element which contians the proper Memory value - fixes #1766 2015-07-21 12:58:58 -07:00
Lars Kellogg-Stedman
6aedc1020e restore mem_limit
mem_limit got lost in the #1744; this restores it.  Thanks to @dgromov
for the report.
2015-07-21 11:52:48 -04:00
Johan Haals
38f01b52e8 Added support for --read-only Docker containers
Adds support for mounting the container's root filesystem as read only.
2015-07-21 14:24:07 +02:00
Brian Coca
55bc9e8fb1 added rickmendes as maintainer 2015-07-20 22:37:02 -04:00
Brian Coca
88167a5dac minor doc fixes to docker_user 2015-07-20 21:18:49 -04:00
Brian Coca
5240124525 Merge pull request #361 from simono/docker-add-user
Add option docker_user for docker module.
2015-07-20 21:17:42 -04:00
Brian Coca
030d6d645c added version_Added for new signal option in docker module 2015-07-20 20:53:59 -04:00
Brian Coca
ac28f16126 Merge pull request #1014 from nemunaire/docker-kill-signal
[Docker] Add signal parameter when killing container
2015-07-20 20:52:49 -04:00
Brian Coca
c0ac6e30a9 Merge pull request #1759 from candlejack297/s3docfix
Updated doc strings so each character isn't considered a line
2015-07-20 20:09:52 -04:00
Brian Coca
2441928484 corrected v ersion added 2015-07-20 20:09:36 -04:00
Brian Coca
289a7e40e3 Merge pull request #385 from dkerwin/docker_add_cpuset
docker: Add support for cpuset
2015-07-20 20:06:27 -04:00
ayush
3f7313cc43 Updated doc strings so each character isn't considered a line 2015-07-20 17:05:10 -07:00
Brian Coca
82f16f5a45 Merge pull request #1315 from HelenaTian/patch-1
Update gce.py to correctly handle propagated metadata type from a mot…
2015-07-20 20:00:00 -04:00
Toshio Kuratomi
01f8a99509 Deprecated _ec2_ami_search now verifies SSL certificates 2015-07-20 13:38:37 -07:00
Daniel Kerwin
d4d78a1998 Too late for 1.8 2015-07-20 21:50:25 +02:00
Daniel Kerwin
a702dbd29a Switch to _cap_ver_req and add cpu_set to create_containers 2015-07-20 21:50:24 +02:00
Daniel Kerwin
a8bc50a11f Renamed to cpu_set 2015-07-20 21:48:39 +02:00
Daniel Kerwin
fca75a9705 Add support for cpusets. Requires docker-py >= 0.6.0 2015-07-20 21:48:39 +02:00
Brian Coca
cf25888e2d Merge pull request #978 from bobrik/faster-docker-updates
[docker] pulling missing docker image before doing anything
2015-07-20 15:33:32 -04:00
Brian Coca
5fcc0be25b Merge pull request #1740 from bcoca/ec2_key_check_fix
attempt to fix check mode when state='absent'
2015-07-18 23:13:03 -04:00
Brian Coca
db19999185 minor doc fixes, version added for latest feature 2015-07-17 23:13:21 -04:00
Brian Coca
ab9d4eb25d Merge pull request #146 from axialops/rds-reboot
rds module: add command to reboot RDS instance
2015-07-17 23:09:07 -04:00
Herby Gillot
048cfb857d rds: add the ability to reboot RDS instances 2015-07-17 21:09:34 -04:00
Brian Coca
5650ed7ec3 Merge pull request #1476 from haad/ec2_elb_lb_sg_name
Add security_group_names paramter to ec2_elb_lb
2015-07-17 20:31:09 -04:00
Brian Coca
1dfe629770 Merge pull request #1744 from larsks/bug/hostconfig
Use HostConfig object when creating container with Docker Remote API > 1.15
2015-07-17 17:15:30 -04:00
Brian Coca
cd88d0f131 Merge pull request #1730 from otdw/devel
removed required together for resource pools, clusters, and templates
2015-07-17 17:05:44 -04:00
Brian Coca
e75235c063 Merge pull request #1628 from wimnat/feature/ec2_vpc_net
ec2_vpc_net refactor
2015-07-17 17:01:49 -04:00
Eero Niemi
3533f39534 Fixed parameter validation when creating a volume from a snapshot 2015-07-17 16:54:39 +03:00
whiter
dc71c04827 Added 'resource_tags' alias 2015-07-17 15:54:17 +10:00
Brian Coca
24c2bccd66 corrected version_added 2015-07-17 01:11:18 -04:00
Brian Coca
a7e54f1692 Merge pull request #1742 from Shrews/os_nova_flavor
Add new os_nova_flavor OpenStack module.
2015-07-16 19:07:12 -04:00
David Shrewsbury
6aac888c7d Add new os_nova_flavor module.
The os_nova_flavor module allows a user with administrative privileges
to create and delete nova flavors.
2015-07-16 19:06:04 -04:00
Maksim Losev
efb6088c27 Use HostConfig object when creating container with Docker Remote API > 1.15
This is mlosev's patch (from #1208), rebased against devel as of
2790af2.  It resolves #1707, which was caused by an API incompatibility
between the docker module and server API version 1.19.
2015-07-16 16:38:20 -04:00
Lars Kellogg-Stedman
444a2ad808 Do not erroneously mask exceptions
There was a catch-all `except` statement in `create_containers`:

        try:
            containers = do_create(count, params)
        except:
            self.pull_image()
            containers = do_create(count, params)

This would mask a variety of errors that should be exposed, including
API compatability errors (as in #1707) and common Python exceptions (KeyError, ValueError, etc) that could result from errors in the code.

This change makes the `except` statement more specific, and only attempts to pull the image and start a container if the original create attempt failed due to a 404 error from the docker API.
2015-07-16 15:25:39 -04:00
Brian Coca
a9e8cae82e attempt to fix check mode when state='absent' 2015-07-16 11:37:22 -04:00
Lars Kellogg-Stedman
6672205f49 docker: permit empty or false pid
The `docker` Python module only accepts `None` or `'host'` as arguments.
This makes it difficult to conditionally set the `pid` attribute using
standard Ansible syntax.

This change converts any value that evaluates as boolean `False` to
`None`, which includes empty strings:

    pid:

As well as an explicit `false`:

    pid: false

This permits the following to work as intended:

    - hosts: localhost
      tasks:
      - name: starting container
        docker:
          docker_api_version: 1.18
          image: larsks/mini-httpd
          name: web
          pid: "{{ container_pid|default('') }}"

If `container_pid` is set to `host` somewhere, this will create a
Docker container with `pid=host`; otherwise, this will create a
container with normal isolated pid namespace.
2015-07-15 21:15:49 -04:00
Lars Kellogg-Stedman
b7e92b3e52 docker: fix parsing of docker __version__ string
If `docker.__version__` contains non-digit characters, such as:

    >>> import docker
    >>> docker.__version__
    '1.4.0-dev'

Then `get_docker_py_versioninfo` will fail with:

    ValueError: invalid literal for int() with base 10: '0-de'

This patch corrects the parsing of the version string so that
`get_docker_py_versioninfo` in this example would return:

    (1, 4, 0, '-dev')
2015-07-15 21:05:13 -04:00
HAMSIK Adam
e3d4256283 Use mutually_exclusive in AnsibleModule 2015-07-15 10:45:38 +02:00
HAMSIK Adam
6d6da470c8 Fix missing , 2015-07-15 10:41:14 +02:00
HAMSIK Adam
959c65c7e0 Add version 2015-07-15 10:41:14 +02:00
HAMSIK Adam
985cdf2c28 Add module parameter for security group name. This make ec2_elb_lb module consitent with others 2015-07-15 10:41:14 +02:00
otdw
dd691779a1 removed required together for resource pools, clusters, and template deployments. fixes inability to deploy from template on vsphere clusters without resource pools. Also, resource pools and cluster should not be required together as they are independant in vsphere 2015-07-14 15:56:14 -07:00
Brian Coca
291fef3b34 fixed version added, reworded description a bit 2015-07-14 17:03:21 -04:00
Brian Coca
b80ec0a335 fixed minor doc issues 2015-07-14 16:55:21 -04:00
Brian Coca
e1067ef670 Revert "Revert "ec2_lc - include all launch config properties in the return"" 2015-07-14 12:02:03 -04:00
Brian Coca
01d4c432b0 Revert "ec2_lc - include all launch config properties in the return" 2015-07-14 11:39:40 -04:00