Commit graph

4081 commits

Author SHA1 Message Date
Lars Kellogg-Stedman
e031efd82c 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.
2016-12-08 11:23:21 -05:00
Lars Kellogg-Stedman
6116e4cdab 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.
2016-12-08 11:23:21 -05:00
Brian Coca
9e54efd3fd fixed version added, reworded description a bit 2016-12-08 11:23:21 -05:00
Brian Coca
16a4ff3462 fixed minor doc issues 2016-12-08 11:23:21 -05:00
Brian Coca
0cab021168 Revert "Revert "ec2_lc - include all launch config properties in the return"" 2016-12-08 11:23:20 -05:00
Brian Coca
af8ded66cc Revert "ec2_lc - include all launch config properties in the return" 2016-12-08 11:23:20 -05:00
Toshio Kuratomi
a655241488 Minor touch ups of vsphere_guest code. 2016-12-08 11:23:20 -05:00
Frank van Tol
39e24e89f4 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.
2016-12-08 11:23:20 -05:00
Frank van Tol
6655cd89c4 Update elasticache.py 2016-12-08 11:23:20 -05:00
Frank van Tol
426f93a291 Remove default for engine_version
Redis and memcached have different engine version numbering, there can not be a shared default value.
2016-12-08 11:23:20 -05:00
Nicholas O'Connor
b95cb3f4e9 Created option snapshot_to_clone. When specified, snapshot_to_clone will create a linked clone copy of the VM. 2016-12-08 11:23:20 -05:00
Apoorva Kulkarni
1f35e578b4 s3 module: Add missing version tag to "encrypt" parameter 2016-12-08 11:23:20 -05:00
Evan Carter
d3ef622627 Adding default cooldown to AWS ASG 2016-12-08 11:23:20 -05:00
vanga
ddd399fe7a Throw error if encryption is set while passing a snapshot id 2016-12-08 11:23:20 -05:00
Chris Meyers
0dbf41e740 ensure password or ssh cert specified 2016-12-08 11:23:20 -05:00
Tom Paine
e97124d609 Update vsphere_guest.py 2016-12-08 11:23:20 -05:00
Joel Thompson
f1ab33ad7b Adding ability to filter AWS Route 53 private hosted zones by attached VPC 2016-12-08 11:23:19 -05:00
Ian Babrou
9219aeaaeb Pulling missing docker image before doing anything 2016-12-08 11:23:19 -05:00
Nic O'Connor
c68d1ffa60 Added the ability to Linked_clone from snapshot 2016-12-08 11:23:19 -05:00
Simon Olofsson
a3cb6d2f16 Add option docker_user for docker module.
docker_user can be used to specify the user or UID to use within the
container.
2016-12-08 11:23:19 -05:00
Monty Taylor
8e26a7ae17 Fix a small typo in parameter processing 2016-12-08 11:23:19 -05:00
Jesse Keating
16381fb5c0 Plumb ipv6 modes into os_subnet
Shade already supports these, we just need to plumb them into the module
code.
2016-12-08 11:23:18 -05:00
Jesse Keating
72809ac329 Fix up docs 2016-12-08 11:23:18 -05:00
Juho-Mikko Pellinen
29620b78fa 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." 2016-12-08 11:23:18 -05:00
Monty Taylor
530f12035b Update docstring to show port ranges as optional 2016-12-08 11:23:18 -05:00
David Shrewsbury
789c1fcbe7 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.
2016-12-08 11:23:18 -05:00
Flyte
2f46364921 Provide correct kwargs to rds2 connection when making a final snapshot 2016-12-08 11:23:18 -05:00
David Shrewsbury
387fe5b0e7 Change required parameters for rules module
The ports and protocol are no longer required (and now depends on
a new version of shade).
2016-12-08 11:23:18 -05:00
Davide Guerri
531b93490b Fix reuse argument documentation 2016-12-08 11:23:18 -05:00
Davide Guerri
95cfe3da96 Update os_floating_ip with new shade methods 2016-12-08 11:23:18 -05:00
Monty Taylor
4f2028439f Use int in the parameter list instead of casting 2016-12-08 11:23:18 -05:00
dagnello
2c3fc61357 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.
2016-12-08 11:23:18 -05:00
David Shrewsbury
e7dd93c5c1 Compare ports as strings
Ports as returned from shade are ints. They are strings as they come
in to the module.
2016-12-08 11:23:18 -05:00
David Shrewsbury
14212c37e2 Fix syntax error 2016-12-08 11:23:18 -05:00
Monty Taylor
60102e36e2 Return rule object 2016-12-08 11:23:18 -05:00
David Shrewsbury
174254a423 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.
2016-12-08 11:23:18 -05:00
David Shrewsbury
fcc1d643f6 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.
2016-12-08 11:23:17 -05:00
David Shrewsbury
b42a9d56e6 Fix id value reference 2016-12-08 11:23:17 -05:00
David Shrewsbury
f02ec15c17 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.
2016-12-08 11:23:17 -05:00
dagnello
ecef2aadba 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.
2016-12-08 11:23:17 -05:00
Davide Guerri
2d7dbc5d0c Fix invalid syntax in openstack_module_kwargs call 2016-12-08 11:23:17 -05:00
Monty Taylor
9acc891477 Fix example code syntax 2016-12-08 11:23:17 -05:00
Monty Taylor
a657e80bc8 Add OpenStack Floating IP Module
Also deprecate the two old quantum floating ip modules.
2016-12-08 11:23:17 -05:00
Monty Taylor
8d5e43c14f Add OpenStack Security Group Rule module 2016-12-08 11:23:17 -05:00
Juho-Mikko Pellinen
321244d881 Remove empty aliases 2016-12-08 11:23:17 -05:00
Juho-Mikko Pellinen
54af79692a Add version number 2016-12-08 11:23:17 -05:00
Juho-Mikko Pellinen
f016cb556b Fix hosted_zone_id after rebase. 2016-12-08 11:23:17 -05:00
Juho-Mikko Pellinen
3f2d1e6bfa Add support for specifying unique hosted zone identifier 2016-12-08 11:23:17 -05:00
Scott Miller
62b6cf85d3 Update cloudformation.py
Fix for inaccurate phrasing
2016-12-08 11:23:17 -05:00
Robb Wagoner
848e9de950 remove double dict & fix increment bug 2016-12-08 11:23:16 -05:00