Commit graph

6631 commits

Author SHA1 Message Date
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
2790af2858 Merge pull request #1737 from larsks/feature/docker-allow-empty-pid
docker: permit empty or false pid
2015-07-15 23:05:43 -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
c27c6d2c8c Merge pull request #1729 from ansible/revert-1728-revert-497-ec2_lc_user_data
Revert "Revert "ec2_lc - include all launch config properties in the …
2015-07-14 16:02:19 -04:00
Brian Coca
77cb2ae5b2 Merge pull request #1728 from ansible/revert-497-ec2_lc_user_data
Revert "ec2_lc - include all launch config properties in the return"
2015-07-14 15:40:45 -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
Brian Coca
e916b04e91 Also document in example that unarchive download was added in 2.0 2015-07-14 10:19:17 -04:00
Brian Coca
cf8db389c1 Merge pull request #1726 from maludwig/devel
Improved stat documentation
2015-07-13 20:02:30 -04:00
Mitchell Ludwig
9e11f5fd15 Improved stat documentation 2015-07-13 17:51:32 -06:00
Brian Coca
91f8b37c24 Merge pull request #1723 from fvant/patch-2
Remove default port value, it does not work in _requires_destroy_and_…
2015-07-13 11:22:41 -04: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
Brian Coca
8d7e61597d Merge pull request #1722 from fvant/patch-1
Remove default for engine_version
2015-07-13 11:04:14 -04: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
ab5b5e8819 corrected version added 2015-07-11 00:15:02 -04:00
Brian Coca
2b53b92dc2 Merge pull request #1539 from acaveroc/mysql_vars_port_definition
Mysql vars port definition
2015-07-11 00:14:02 -04:00
Brian Coca
f2acf41c77 Merge pull request #1700 from faulkner/django_manage-collectstatic-change
Report change status on django_manage collectstatic.
2015-07-10 21:16:22 -04:00
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
514b35d7d7 Merge pull request #1712 from cchurch/win_get_url_updates
win_get_url: add force to module docs, default to force=yes
2015-07-10 17:06:58 -04:00
Chris Church
b106a83d0a Set force=yes as the default, add force parameter to module docs. 2015-07-10 16:34:46 -04: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
James Cammarata
9acf10face Correctly default crypt_scheme in htpasswd 2015-07-10 13:51:25 -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
Greg DeKoenigsberg
b1f8f0d48d Merge pull request #1485 from talcloudshare/win_get_url-modified
win_get_url re-download file only if modified
2015-07-10 12:06:03 -04:00
Brian Coca
11c6e6a3f5 Merge pull request #1179 from hver/devel
Allow custom methods in uri module
2015-07-10 09:50:51 -04:00
Chris Faulkner
440b395f37 Report change status on django_manage collectstatic. 2015-07-09 14:36:52 -07: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
Toshio Kuratomi
d46c036b75 Add notes about loop squashing and 1.9.2 change to install packages in one yum transaction 2015-07-09 08:17:00 -07: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
Hennadiy (Gena) Verkh
f190f98b06 Update uri.py
Added methods 'TRACE', 'CONNECT' from https://www.rfc-editor.org/rfc/rfc2616.txt, section 5.1.1
Added method 'REFRESH'
2015-07-09 11:39:46 +02:00
Brian Coca
e33f093075 added ignore hidden to assemble 2015-07-09 00:28: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