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

1973 commits

Author SHA1 Message Date
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
brannon
bf4403d547 Support creating new VMs by cloning an existing VM. 
Support setting power state of cloned VMs.
 2015-07-25 17:16:10 -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
Guto Andreollo
b00fe3e22b Added the 'hw_interfaces' array, listing the names of all interfaces present on the VM as 'ansible_interfaces' lists the ones seen by the operating system 2015-07-20 18:39:31 -03: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
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
Nikolay Ivanko
a24ffc1056 add virtual floppy to VMware guest 2015-07-13 14:31:39 +03: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
dagnello
d35df1f217 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:02 -04:00
Davide Guerri
a9301ba918 Fix invalid syntax in openstack_module_kwargs call 2015-07-06 18:50:02 -04:00
Monty Taylor
08b4bb42c4 Fix example code syntax 2015-07-06 18:50:02 -04:00
Monty Taylor
08b2f31915 Add OpenStack Security Group Rule module 2015-07-06 18:50:02 -04:00
Juho-Mikko Pellinen
041dc8b587 Remove empty aliases 2015-07-06 13:08:46 +03:00
Juho-Mikko Pellinen
228c03bd67 Add version number 2015-07-06 13:07:33 +03:00
Juho-Mikko Pellinen
f0ad6c5a1f Fix hosted_zone_id after rebase. 2015-07-06 13:02:24 +03:00
Juho-Mikko Pellinen
71ebe6321b Add support for specifying unique hosted zone identifier 2015-07-06 11:31:02 +03:00
Juho-Mikko Pellinen
110f618487 Add support for specifying unique hosted zone identifier 2015-07-06 11:29:03 +03:00
Brian Coca
52543435d6 Merge pull request #1562 from micxer/iam_policy-json-string 
Add the option to pass a string as policy
 2015-07-04 19:11:34 -04:00
Brian Coca
981f0ad481 Merge pull request #1635 from smiller171/devel 
update docs for cloudformation
 2015-07-04 16:19:28 -04:00
Brian Coca
51b6b725cc Merge pull request #1078 from andrewgdavis/devel 
ansible_facts reflects 1.8 output
 2015-07-04 15:19:22 -04:00
Scott Miller
c3c2e6ab72 Update cloudformation.py 
Fix for inaccurate phrasing
 2015-07-04 14:45:21 -04:00
Mike Putnam
6c0e264806 Add missing GPLv3 License header 
Fixes #1643
 2015-07-03 22:57:53 -05:00
Brian Coca
17bb405578 Merge pull request #1659 from mikeputnam/fix-docs-descrepancy 
Upstream docs show launch_config_name as required.
 2015-07-03 22:46:49 -04:00
Toshio Kuratomi
ac3024e57e Merge pull request #1620 from robbwagoner/ec2_elb_lb_instances 
return health of instances and counts
 2015-07-02 10:58:02 -07:00
Robb Wagoner
8f0d462fd0 remove double dict & fix increment bug 2015-07-02 06:16:43 -07:00
Flyte
3d9a8caa59 Provide correct kwargs to rds2 connection when making a final snapshot 2015-07-02 09:32:10 +01:00
whiter
ee782d822b Fixed dicts comparison for tags 2015-07-02 15:24:39 +10:00
Mike Putnam
5c17a99a1c Upstream docs show launch_config_name as required. 
http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_AutoScalingGroup.html

Fixes #11209

Ansible behavior is correct, this commit just updates the docs to
reflect that correctness.
 2015-07-01 20:58:17 -05:00
Toshio Kuratomi
ff69ce7912 Merge pull request #1638 from j2sol/bugfix/os_server_afip_doc 
Document auto_floating_ip argument
 2015-07-01 08:15:53 -07:00
Toshio Kuratomi
c71f85377d Merge pull request #1637 from defionscode/quick_iam_patch 
no_log to iam password
 2015-07-01 08:13:44 -07:00
Toshio Kuratomi
968386cba3 Merge pull request #1631 from emonty/features/single-cloud-details 
Add filter ability to OpenStack os-client-config module
 2015-07-01 08:07:37 -07:00
Toshio Kuratomi
8f13f8851f Merge pull request #1582 from evanccnyc/devel 
Add ClassicLink settings to EC2_launchconfig
 2015-07-01 07:49:20 -07:00
Toshio Kuratomi
02b6df3160 Fix indentation levels in os_keypair 2015-07-01 05:00:39 -07:00
Toshio Kuratomi
8f74a73713 Merge pull request #1561 from micxer/iam_policy-fix 
Fix connection creation in iam_policy module to allow usage of profiles with boto
 2015-06-30 13:39:32 -07:00
Toshio Kuratomi
edad5c80ff Few minor things from review of the pull request 2015-06-30 13:18:56 -07:00
Toshio Kuratomi
8703fb3c76 Merge pull request #1045 from emonty/feature/os_keypair 
Add OpenStack Keypair module
 2015-06-30 13:17:27 -07:00
Ash Caire
3ccf2e8a86 add headers param to s3 uploads 2015-06-30 23:04:15 +10:00
Toshio Kuratomi
406402bb26 Merge pull request #332 from proby/add-s3-list 
Add support for listing keys in a specific S3 bucket
 2015-06-30 04:58:58 -07:00
Michael Weinrich
4da3a724f1 Fix connection creation to allow usage of profiles with boto 2015-06-30 08:51:36 +02:00
Brian Coca
79ad99bc67 Merge pull request #497 from robbwagoner/ec2_lc_user_data 
ec2_lc - include all launch config properties in the return
 2015-06-30 00:26:38 -04:00
Brian Coca
afeb3c8d07 Merge pull request #1031 from smashwilson/docker-wait 
[docker] Wait for process exit on detached=no.
 2015-06-30 00:24:02 -04:00
Brian Coca
8b290c6274 Merge pull request #831 from j-carl/feature-route53-nameserver 
List the name servers of a zone. Fixes #801
 2015-06-30 00:11:11 -04:00
Brian Coca
5f5f01833f Merge pull request #1508 from tarrychk/issue_1442 
Fix computation of port bindings
 2015-06-29 23:54:27 -04:00
Brian Coca
038cc05f4e Merge pull request #1609 from smashwilson/default-net-bridge 
[docker] Prevent unnecessary reloads due to the net parameter
 2015-06-29 23:38:32 -04:00
Brian Coca
ec15b67712 Merge pull request #547 from steveeJ/devel 
Fix bind-volumes on docker >= 1.4.0
 2015-06-29 20:13:23 -04:00
Jesse Keating
ddc78c82a4 Document auto_floating_ip argument 2015-06-29 14:06:50 -07:00
Toshio Kuratomi
7edacf6b1c Use module.fail_json() instead of sys.exit() 2015-06-29 13:26:21 -07:00