Commit Graph

2060 Commits (4c14e6267f7a233c749ccf129729e22bafc8ba80)

Author SHA1 Message Date
Brian Coca 4c14e6267f Merge pull request #2258 from SamYaple/fix_docker_bug_2257
Don't assume ExposedPorts exists (bug #2257)
9 years ago
Adam Williamson 64b8596250 fix #2043: strip empty dict from end of 'pull' stream
When pulling an image using Docker 1.8, it seems the output
JSON stream has an empty dict at the very end. This causes
ansible to fail when pulling an image, as it's expecting a
status message in that dict which it uses to determine whether
it had to download the image or not. As a bit of an ugly hack
for that which remains backward compatible, try the last item
in the stream, and if it's an empty dict, take the last-but-one
item instead.

The strip() is needed as the exact value appears to be '{}/r/n';
we could just match that, but it seems like the kind of thing
where maybe it'd happen to just be '{}/n' or '{}' or something
in some cases, so let's just use strip() in case.
9 years ago
Sam Yaple f15d285514 Catch the second occurance of ExposedPorts as well 9 years ago
Sam Yaple 9db5ac8e45 Don't assume ExposedPorts exists (bug #2257)
A recent change [1] in docker between v1.8.2 and v1.8.3 changed what
is returned in the json when inspecting an image. Five variables which
could have been expected before will now be omited when empty. Only
one of those variables is being addressed in the docker, ExposedPorts.

Unfortunately there was also no API version change on this so this
can't be easily corrected with pinning the API to the older version.

This does a get() which will return None if the variable is not in the
dict formed from the json that was returned. Everything else works the
same way.

[1] 9098628b29
9 years ago
Brian Coca 6f9ff0b914 Merge pull request #2248 from Constantin07/devel
ec2_vol: added deleteOnTermination in the output of list option
9 years ago
Brian Coca da1a317f7d Merge pull request #2139 from justnom/devel
Adding additional Docker log drivers.
9 years ago
Brian Coca f1fc76d732 Merge pull request #2214 from fperks/fix-ec2-error-on-instance-status-change
Fix error on ec2 status change
9 years ago
Brian Coca 547cafe278 Merge pull request #2198 from hutchic/patch-2
make a text link into a actual hyperlink
9 years ago
Constantin Bugneac 83291dbefc Added deleteOnTermination in the output of list option 9 years ago
Abhijit Menon-Sen ebd8b12e15 Add missing variable initializations
Without this, «ec2: state=stopped instance_ids=…» would fail with a
traceback like this:

    if inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check:
NameError: global name 'source_dest_check' is not defined
9 years ago
Brian Coca f707a711cd doc fixes 9 years ago
Frank van Tol 2c24d0482b Update ec2_asg.py 9 years ago
Brian Coca 5f1f1b2904 Merge pull request #2216 from wimnat/feature/revert-1906
Set default of dimensions parameter to be empty dict
9 years ago
Rob 5a6599d70d Move import statements for easier debugging (correct line numbers) 9 years ago
Brian Coca 9eb0c178ec Merge pull request #725 from robbwagoner/cloudformation-resources
module cloudformation: include a CFN stack's resources in the result
9 years ago
Brian Coca 85570152a7 Merge pull request #1626 from kmadac/fixed-digital-ocean-domain-MX-Origin-Error
Fixed bug, when MX records pointed to ORIGIN(@) caused unintentional …
9 years ago
Brian Coca 692781c936 Merge pull request #2070 from fvant/patch-7
We are copying from S3,  the bucket is the source, not the target.
9 years ago
Brian Coca 969c4eb493 Merge pull request #2078 from abithap/devel
os_server: Adding support to accept 'n' nic args as a string containi…
9 years ago
Brian Coca 7af7ef2ef7 Merge pull request #2086 from wimnat/feature/issue-2085
Remove 'str' type so that json is properly quoted
9 years ago
Brian Coca af82f4b23e Merge pull request #2105 from dagnello/network_list_state
Adding os_networks_facts module
9 years ago
Brian Coca 00a18c2a6e Merge pull request #2110 from dagnello/os_image_facts
Adding new image facts module
9 years ago
Brian Coca cb203420ed added version added to new rax_cdb choices 9 years ago
Brian Coca 202236f47f Merge pull request #1689 from mehulved/devel
Added support for instance types.
9 years ago
Brian Coca 547690c785 Merge pull request #2169 from stelligent/devel
Replaces 'old' get_ec2_creds connection method with get_aws_connection_info
9 years ago
Brian Coca c4f64d822c changed modules to use common ec2 docs for region 9 years ago
fperks 7fd3262c3c Fix error on ec2 status change
Both `source_dest_check` and `termination_protection` variables are not
available within the scope of the startstopec2 instance method. This just
pulls them from module.params.
9 years ago
Rob ca517abf07 Set default of dimensions parameter to be empty dict 9 years ago
Adrian Lopez 8c7d697c17 Fix yaml syntax 9 years ago
James Cammarata a3e7f5cfcc Merge pull request #2062 from wimnat/feature/iam_policy_doc_fix
Update iam_policy.py doc and state default parameter
9 years ago
James Cammarata 02c9a1b336 Merge pull request #2158 from Shrews/os_network
Allow setting external attribute
9 years ago
Brian Coca d4a03eed10 Merge pull request #2201 from halberom/qfix
ec2_tag - minor doc fix
9 years ago
Gerard Lynch 8b1ee3d6cb minor doc fix 9 years ago
Colin Hutchinson f7aa6c4d27 make a text link into a actual hyperlink
the text link doesn't fit on some screen resolutions. Making it into sphinx hyperlink will solve that
9 years ago
Toshio Kuratomi dbc860daaa Fix docs build 9 years ago
Brian Coca 79ec9efd7b Merge pull request #1048 from emonty/feature/os_router
Add OpenStack Router module
9 years ago
David Shrewsbury aa1e8b8b05 Add author to os_router 9 years ago
David Shrewsbury 08e91ef68f Deprecate older router modules.
The quantum_router_gateway.py and quantum_router_interface.py modules
are deprecated with this change.
9 years ago
Matt Martz 45c5b4bf4b Merge pull request #1002 from vmihailenco/fix/rx-isdir-path
rackspace: pass full path to the isdir.
9 years ago
Brian Coca da220e0bb0 added version_added 9 years ago
Alex Kessinger 4308ae25c4 Fix a argument mismatch in elasticache
I think in this commit 720aeffca2

There was bug introduced where the ElastiCacheManager init method has
a number of positional arguments like so.

```py
    def __init__(self, module, name, engine, cache_engine_version, node_type,
                 num_nodes, cache_port, parameter_group, cache_subnet_group,
                 cache_security_groups, security_group_ids, zone, wait,
                 hard_modify, region, **aws_connect_kwargs):
```

But then later in the code the positional arguments are passed in
like this.

```py
    elasticache_manager = ElastiCacheManager(module, name, engine,
                                             cache_engine_version, node_type,
                                             num_nodes, cache_port,
                                             cache_subnet_group,
                                             cache_security_groups,
                                             security_group_ids, parameter_group, zone, wait,
                                             hard_modify, region, **aws_connect_kwargs)
```

If you count, you can see that cache_subnet_group, is being passed in
where the manager expects to see parameter_group.
9 years ago
Brian Coca 653b55bf68 Merge pull request #2160 from j-carl/fix_amazon-cloudformation-userdir
Fix to handle user directory within parameter 'template'.
9 years ago
Jens Carl dc109387bd Change type of parameter 'template' to 'path'. 9 years ago
Shayne Clausson 841835ebac Replaces 'old' get_ec2_creds connection method with get_aws_connection_info to
support passing in security_token for temporary creds.
9 years ago
Toshio Kuratomi a4ac171a07 Merge pull request #2124 from halberom/ec2_adjust_vol_handling
ec2 - allow use of volume_type in volumes dict
9 years ago
Gerard Lynch 1857263b63 allow use of volume_type in volumes dict 9 years ago
Toshio Kuratomi d5f62798f0 Docs fixes 9 years ago
Toshio Kuratomi 6cad03644f Merge pull request #2130 from shawnsilva/modify-rds-size
Fix for modifying the size of an RDS instance.
9 years ago
Toshio Kuratomi 3b5f232d4d Merge pull request #2143 from atplanet/ec2-ami-mod-clarify-block-device-mapping
Clarify available options for device_mapping parameter of ec2_ami module
9 years ago
Toshio Kuratomi b28df8d600 Merge pull request #2127 from selivan/patch-1
ec2_group.py: added ICMP rule example
9 years ago
Jens Carl e25605cd5b Fix to handle user directory within parameter 'template'. 9 years ago