Commit graph

1803 commits

Author SHA1 Message Date
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
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
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
Toshio Kuratomi
e6ecca8809 Minor touch ups of vsphere_guest code. 2015-07-14 07:27:09 -07:00
Toshio Kuratomi
17cd8cddac Merge pull request #739 from NicCOConnor/vsphere_linkedclone
Added the ability to Linked_clone from snapshot in vsphere_guest module
2015-07-14 07:20:38 -07:00
Frank van Tol
300656ca07 Remove default port value, it does not work in _requires_destroy_and_create logic
When creating a Redis cluster, every run it gets destroyed and recreated because the port number of memcached is used as the default.
2015-07-13 17:21:16 +02:00
Frank van Tol
a85640c368 Update elasticache.py 2015-07-13 16:52:30 +02:00
Frank van Tol
a7f33ee533 Remove default for engine_version
Redis and memcached have different engine version numbering, there can not be a shared default value.
2015-07-13 16:45:41 +02:00
Brian Coca
4d4d63c41e Merge pull request #1403 from aioue/patch-5
Update vsphere_guest.py
2015-07-13 09:58:06 -04:00
Benno Joy
63fa06f477 Merge pull request #1385 from joelthompson/devel
Adding ability to filter AWS Route 53 private hosted zones by attache…
2015-07-12 16:36:59 +05:30
Brian Coca
b38f0a34d2 Merge pull request #1702 from askulkarni2/devel
s3 module: Add missing version tag to "encrypt" parameter
2015-07-10 20:44:19 -04:00
Brian Coca
fb260f4cc2 Merge pull request #1698 from evanccnyc/devel
Adding default cooldown to AWS ASG
2015-07-10 20:21:20 -04:00
Apoorva Kulkarni
c0e4c50eeb s3 module: Add missing version tag to "encrypt" parameter 2015-07-10 14:56:34 -07:00
Brian Coca
bba1e66896 Merge pull request #1696 from chrismeyersfsu/fix-azure-password
ensure password or ssh cert specified
2015-07-10 13:57:11 -04:00
Joel Thompson
10df7b97ee Adding ability to filter AWS Route 53 private hosted zones by attached VPC 2015-07-10 13:51:33 -04:00
Brian Coca
314913ee77 Merge pull request #1694 from vanga/devel
Throw error if encryption is set while passing a snapshot id
2015-07-10 13:50:07 -04:00
Toshio Kuratomi
350063532e Merge pull request #1685 from j2sol/feature/os_subnet_ipv6
Plumb ipv6 modes into os_subnet
2015-07-09 14:10:56 -07:00
Nicholas O'Connor
9144785c42 Created option snapshot_to_clone. When specified, snapshot_to_clone will create a linked clone copy of the VM. 2015-07-09 16:46:39 -04:00
Evan Carter
68bd17b15e Adding default cooldown to AWS ASG 2015-07-09 15:29:00 -04:00
Chris Meyers
59225ca7b0 ensure password or ssh cert specified 2015-07-09 13:33:46 -04:00
vanga
164043bd6d Throw error if encryption is set while passing a snapshot id 2015-07-09 20:42:54 +05:30
Monty Taylor
007efe438d Merge pull request #1690 from emonty/typo-fix
Fix a small typo in parameter processing
2015-07-09 09:36:00 -04:00
Monty Taylor
fbb6277a37 Fix a small typo in parameter processing 2015-07-09 09:33:10 -04:00
Brian Coca
5ec040a1d2 Merge pull request #1680 from Pallokala/topic_ec2_volume_default_encryption_flag_value_to_None
Change the default flag value to None to prevent AWS complaining: "In…
2015-07-08 22:36:13 -04:00
Nic O'Connor
706f5e25cc Added the ability to Linked_clone from snapshot 2015-07-08 15:01:01 -04:00
Brian Coca
e3c774be6f Merge pull request #1632 from emonty/feature/os_floating_ip
Add OpenStack Floating IP module
2015-07-07 19:42:42 -04:00
Jesse Keating
de89f9f99a Plumb ipv6 modes into os_subnet
Shade already supports these, we just need to plumb them into the module
code.
2015-07-07 16:10:44 -07:00
Jesse Keating
76398781ba Fix up docs 2015-07-07 15:29:47 -07:00
Tom Paine
d6d6186aef Update vsphere_guest.py 2015-07-07 20:30:33 +01:00
Tom Paine
d9db201b9a Update vsphere_guest.py 2015-07-07 20:30:07 +01:00
Brian Coca
8257053756 Merge pull request #1538 from emonty/feature/os_security_group_rule
Add OpenStack Security Group Rule Module
2015-07-07 12:38:25 -04:00
Brian Coca
12fbc4712f Merge pull request #1646 from flyte/rds2-snapshot-on-delete
Provide correct kwargs to rds2 connection when making a final snapshot
2015-07-07 10:23:57 -04:00
Juho-Mikko Pellinen
b4911a47d1 Change the default flag value to None to prevent AWS complaining: "Instance creation failed => InvalidBlockDeviceMapping: the encrypted flag cannot be specified since device /dev/sda1 has a snapshot specified." 2015-07-07 16:31:47 +03:00
Monty Taylor
dd9c292861 Update docstring to show port ranges as optional 2015-07-06 18:53:31 -04:00
David Shrewsbury
6933407cd4 Correct port matching logic
Port matching logic did not take into account recent shade change
to equate (None, None) to (1, 65535) when Nova is the backend.

Also, this encapsulates the port matching logic into a single function
and heavily documents the logic.
2015-07-06 18:50:03 -04:00
David Shrewsbury
8664c88417 Change required parameters for rules module
The ports and protocol are no longer required (and now depends on
a new version of shade).
2015-07-06 18:50:03 -04:00
Monty Taylor
9f03302b68 Use int in the parameter list instead of casting 2015-07-06 18:50:03 -04:00
dagnello
2e8daa2330 Resolving issues in rule comparison algorithm
Port range min/max values are at times represented as string and
compared to int equivalents.  This fix explicitly ensures all
port range values are ints for proper comparisons.
2015-07-06 18:50:03 -04:00
David Shrewsbury
f027e75976 Compare ports as strings
Ports as returned from shade are ints. They are strings as they come
in to the module.
2015-07-06 18:50:03 -04:00
David Shrewsbury
9d0c8b0507 Fix syntax error 2015-07-06 18:50:03 -04:00
Monty Taylor
0e5942d7e7 Return rule object 2015-07-06 18:50:03 -04:00
David Shrewsbury
16b3b72294 Update secgroup rules module for latest shade
This allows the rules module to work against either nova or neutron
for handling security groups. New parameters for 'direction' and
'ethertype' are added.

Check mode is supported with this version.
2015-07-06 18:50:03 -04:00
David Shrewsbury
5b6c6cac20 Recongnize None and -1 port equivalency
shade 0.7.0 represents disabled min/max ports as None (in the
neutron style) rather than -1. Recognize this as the same as -1.
2015-07-06 18:50:03 -04:00
David Shrewsbury
5758b4ebdc Fix id value reference 2015-07-06 18:50:03 -04:00
David Shrewsbury
8f2e70a1c1 Update rules mode for latest shade
Shade 0.7.0 normalized the security group data that is returned,
when using nova, to look more like neutron security group data.
This adjusts for that change.
2015-07-06 18:50:03 -04:00
dagnello
b98e6663e8 Minor fixes for os_security_group_rule module
Was not able to use this module as it was.  The changes submitted
resolved the issues I ran into in order to get it working.
2015-07-06 18:50:03 -04:00