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

6878 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brian Coca
89edbfa269 Merge pull request #1747 from eeroniemi/devel 
Fixed parameter validation when creating a volume from a snapshot
 2015-07-17 12:09:10 -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
Brian Coca
963eb242f1 updated to add missing 'use' option 2015-07-16 16:53:17 -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
Brian Coca
fa85d95910 Merge pull request #1743 from larsks/feature/expose-api-errors 
Do not erroneously mask exceptions in docker module
 2015-07-16 15:38:51 -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
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
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
Matthias Frey
68a3c6ece4 assemble: add file validation support. 2015-07-15 16:35:45 +02:00
Mischa ter Smitten
0ca732baaf The tilde expansion doesn't work with user.home 2015-07-15 12:00:23 +02: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
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