Commit graph

2463 commits

Author SHA1 Message Date
Brian Coca
f4ed4b37a9 Merge pull request #2126 from nfelsen/access_logs
Adding support for access logs in ELB
2015-10-19 20:06:31 -04:00
Brian Coca
250b1f48fc Merge pull request #2274 from niothiel/devel
Remove duplicate logic
2015-10-19 17:53:53 -04:00
Brian Coca
0f308e1e07 Merge pull request #2275 from larsks/bug/2253
fix handling of nics argument
2015-10-19 16:39:51 -04:00
Brian Coca
b73ffa3b6f Merge pull request #2310 from Shrews/os_router
Fix os_router to accept internal interfaces
2015-10-19 16:24:54 -04:00
David Shrewsbury
55e9dc73f5 Fix os_router to accept internal interfaces
Allow the 'interfaces' attribute to represent internal router
interfaces, composed of subnet names, and the 'external_fixed_ips'
attribute to represent external interface subnet/IP.
2015-10-19 15:53:15 -04:00
Brian Coca
300c816503 Merge pull request #2180 from wimnat/feature/issue-695
Resolve issue 695 (no change reported) and other misc fixes
2015-10-19 10:47:02 -04:00
Lars Kellogg-Stedman
06098a9d69 fix handling of nics argument
The existing code was receiving a list of strings and erroneously
assuming it was being given a list of dictionaries, leading it to fail
with:

    AttributeError: 'str' object has no attribute 'get'

This commit corrects the list handling code to check the type of each
item and handle it appropriately.   Also, based on bcoca's comment
in #2253, thie code removes the special case for a string-only argument.

By transforming string arguments into dicts and then handling them like
any other dict argument, this also permits arguments of the form:

    nics: net-name=mynet

Or:

    nics: port-name=mynet

Previous versions of this code only supported `net-id` and `port-id` in
string specifications.
2015-10-18 21:54:40 -04:00
Monty Taylor
4590ba4e59 Make the auto ip parameter auto_ip
There was a parameter in the docs called 'public_ip' that didn't
actually exist. Additionally, auto_floating_ip is not consistent with
the underlying parameter which is auto_ip - for no good reason.

Add auto_ip as the real parameter, and then make public_ip and
auto_floating_ip as aliases for it for backwards compatability.

Fixes #2301
2015-10-18 14:11:26 -04:00
Brian Coca
1ec0c1893a added note on when reboot command became available
fixes #2050
2015-10-17 00:49:01 -04:00
Brian Coca
5da7cf696c fixed results docs 2015-10-16 14:12:11 -04:00
Toshio Kuratomi
3af0d509c5 Some docs fixes 2015-10-16 11:03:53 -07:00
Constantin Bugneac
e715f7f968 Included 'block_device_mapping' in the output of module and other missing attributes 2015-10-16 16:08:10 +01:00
Nathaniel Felsen
2e74b17fad fixing merge conflict 2015-10-16 00:25:15 -07:00
Brian Coca
f2cd132cd0 Merge pull request #2287 from pgilad/patch-1
Docs: add state choices to ec2_elb_lb
2015-10-15 18:19:56 -04:00
Gilad Peleg
68e1ff2f81 Docs: remove redundant quotes in ec2_elb docs 2015-10-16 00:57:04 +03:00
Gilad Peleg
970185f2d2 Docs: add state choices to ec2_elb_lb
add state options (`present` and `absent`) to `ec2_elb-lb` doc
2015-10-16 00:37:21 +03:00
Brian Coca
7b21bc7144 Merge pull request #2238 from dagnello/server_meta_string
Adding string support to metadata argument
2015-10-15 14:44:57 -04:00
Brian Coca
3e22a45401 Merge pull request #2217 from wimnat/feature/issue-868
Add region to doc and handle missing region parameter
2015-10-15 10:17:14 -04:00
Brian Coca
6e54a5edc5 Merge pull request #2077 from dagnello/subnet_list_state
Adding os_subnets_facts module
2015-10-15 08:52:19 -04:00
whiter
6fc58855b9 Allow iam_policy to maintain idempotentce if the role referenced has been removed 2015-10-15 13:21:05 +11:00
whiter
cccef7b135 Remove access_key and secret_key as these are provided by aws doc fragment
Remove ec2 doc fragment as region is not required for IAM
2015-10-15 12:58:03 +11:00
whiter
5e61f0882b Add region to doc and handle missing region parameter 2015-10-15 01:31:42 +00:00
Rob
3360cef024 Update ec2_vol.py
Changed=true now reported on new volume.
Only detach volume when instance is specified as 'None' or '' rather than whenever instance is not specified at all
Fix regression caused by 6b27cdc where by no volume is created if id or Name is not supplied
Remove unnecessary empty aliases
Corrected example to use acceptable parameter for ions
Added exception handling to get_all_instances call
Moved the attachment state validation code to attach_volume function rather than create_volume function
Refactored attach_volume and detach_volume so that changed state can be passed back to call
Created get_volume_info function so that state=present and state=list can return the same data.  Also added instance_id as a returned value in attachment_set dict
Updated aws connection method so that boto profile can be used
2015-10-15 01:20:23 +00:00
Brian Coca
f35ab5faca Merge pull request #2106 from dagnello/port_module
Adding os_port Module to openstack ansible modules
2015-10-14 16:40:11 -04:00
Val Komarov
986d4064e9 Remove duplicate logic 2015-10-14 15:54:04 -04:00
Brian Coca
eb30416d71 Merge pull request #2114 from matiasdecarli/devel
Update Azure Module to work with azure.py=1.0.1
2015-10-14 15:46:26 -04:00
Brian Coca
4c14e6267f Merge pull request #2258 from SamYaple/fix_docker_bug_2257
Don't assume ExposedPorts exists (bug #2257)
2015-10-14 11:31:06 -04:00
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.
2015-10-13 22:33:46 -07:00
Sam Yaple
f15d285514 Catch the second occurance of ExposedPorts as well 2015-10-13 10:34:08 +00:00
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
2015-10-13 10:24:36 +00:00
Brian Coca
6f9ff0b914 Merge pull request #2248 from Constantin07/devel
ec2_vol: added deleteOnTermination in the output of list option
2015-10-12 18:47:31 -04:00
Brian Coca
da1a317f7d Merge pull request #2139 from justnom/devel
Adding additional Docker log drivers.
2015-10-12 18:45:55 -04:00
Brian Coca
f1fc76d732 Merge pull request #2214 from fperks/fix-ec2-error-on-instance-status-change
Fix error on ec2 status change
2015-10-12 18:38:10 -04:00
Brian Coca
547cafe278 Merge pull request #2198 from hutchic/patch-2
make a text link into a actual hyperlink
2015-10-12 18:29:45 -04:00
Adrian Bridgett
cc821492d3 remove unneeded aliases 2015-10-12 17:45:37 +01:00
Constantin Bugneac
83291dbefc Added deleteOnTermination in the output of list option 2015-10-12 10:49:16 +01:00
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
2015-10-11 07:25:56 +05:30
Aaron Boushley
81e9d1bde5 Fix issue with comparing versions improperly.
This allows old versions of docker api to function.
2015-10-09 16:26:46 -07:00
Brian Coca
f707a711cd doc fixes 2015-10-09 18:36:58 -04:00
dagnello
83a9f293fd Adding string support to metadata argument
This patch adds support to setting metadata key/value through a string
argument.  Variables can now be used for both the metadata key and
value.

example:
meta: "{{ var1 }}:SomeValue,key:{{ var2 }}"
2015-10-09 15:28:56 -04:00
Frank van Tol
2c24d0482b Update ec2_asg.py 2015-10-09 14:35:26 +02:00
Adrian Bridgett
686ceb81d7 add idle_timeout support 2015-10-08 16:28:01 +01:00
Brian Coca
5f1f1b2904 Merge pull request #2216 from wimnat/feature/revert-1906
Set default of dimensions parameter to be empty dict
2015-10-08 11:03:21 -04:00
Rob
5a6599d70d Move import statements for easier debugging (correct line numbers) 2015-10-08 14:03:40 +11:00
Brian Coca
9eb0c178ec Merge pull request #725 from robbwagoner/cloudformation-resources
module cloudformation: include a CFN stack's resources in the result
2015-10-07 21:35:39 -04:00
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 …
2015-10-07 21:35:06 -04:00
Brian Coca
692781c936 Merge pull request #2070 from fvant/patch-7
We are copying from S3,  the bucket is the source, not the target.
2015-10-07 21:34:48 -04:00
Brian Coca
969c4eb493 Merge pull request #2078 from abithap/devel
os_server: Adding support to accept 'n' nic args as a string containi…
2015-10-07 21:34:33 -04:00
Brian Coca
7af7ef2ef7 Merge pull request #2086 from wimnat/feature/issue-2085
Remove 'str' type so that json is properly quoted
2015-10-07 21:34:00 -04:00
Brian Coca
af82f4b23e Merge pull request #2105 from dagnello/network_list_state
Adding os_networks_facts module
2015-10-07 21:33:28 -04:00
Brian Coca
00a18c2a6e Merge pull request #2110 from dagnello/os_image_facts
Adding new image facts module
2015-10-07 21:32:48 -04:00
Brian Coca
cb203420ed added version added to new rax_cdb choices 2015-10-07 21:30:17 -04:00
Brian Coca
202236f47f Merge pull request #1689 from mehulved/devel
Added support for instance types.
2015-10-07 21:27:06 -04:00
Brian Coca
547690c785 Merge pull request #2169 from stelligent/devel
Replaces 'old' get_ec2_creds connection method with get_aws_connection_info
2015-10-07 21:26:14 -04:00
Brian Coca
c4f64d822c changed modules to use common ec2 docs for region 2015-10-07 16:16:24 -04:00
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.
2015-10-07 13:43:57 -04:00
Gilad Peleg
5f914e854b Add state=running on some ec2 examples
`state=running` was missing in some of the ec2 module examples
2015-10-07 14:49:05 +03:00
Rob
ca517abf07 Set default of dimensions parameter to be empty dict 2015-10-07 13:54:00 +11:00
Kai Webber
d0b30dd86d Added launch group support for ec2 module 2015-10-06 20:26:10 +03:00
Andrew Pashkin
cee7e928fc Add 'entrypoint' parameter to Docker module 2015-10-06 12:47:47 +03:00
Adrian Lopez
8c7d697c17 Fix yaml syntax 2015-10-06 10:26:44 +02:00
dagnello
3365dad0d8 Adding os_port Module to openstack ansible modules 2015-10-05 19:36:37 -04:00
James Cammarata
a3e7f5cfcc Merge pull request #2062 from wimnat/feature/iam_policy_doc_fix
Update iam_policy.py doc and state default parameter
2015-10-05 16:53:14 -04:00
James Cammarata
02c9a1b336 Merge pull request #2158 from Shrews/os_network
Allow setting external attribute
2015-10-05 16:22:42 -04:00
Brian Coca
d4a03eed10 Merge pull request #2201 from halberom/qfix
ec2_tag - minor doc fix
2015-10-04 13:27:58 -04:00
Gerard Lynch
8b1ee3d6cb minor doc fix 2015-10-04 17:32:12 +01:00
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
2015-10-03 21:50:15 -04:00
Michael Fenn
9b04ca55f1 Support cloning VMs into a specific VM folder
The pysphere VIVirtualMachine.clone() method supports specifying a VM
folder to place the VM in after the clone has completed.  This exposes
that functionality to playbooks.

Also documents that creating VMs could always place VMs in a specific
folder.
2015-10-03 14:31:22 -04:00
Matias De Carli
c2520e6b67 keep backwards compatibility 2015-10-03 14:03:54 -03:00
Toshio Kuratomi
dbc860daaa Fix docs build 2015-10-02 09:21:29 -07:00
Brian Coca
79ec9efd7b Merge pull request #1048 from emonty/feature/os_router
Add OpenStack Router module
2015-10-02 10:10:31 -04:00
David Shrewsbury
aa1e8b8b05 Add author to os_router 2015-10-02 09:41:18 -04:00
David Shrewsbury
08e91ef68f Deprecate older router modules.
The quantum_router_gateway.py and quantum_router_interface.py modules
are deprecated with this change.
2015-10-02 09:24:03 -04:00
Andrew Pashkin
e96549c95d Harden matching running containers by "command" in the Docker module
Before this patch:

  - Command was matched if 'Command' field of docker-py
    representation of Docker container ends with 'command' passed
    to Ansible docker module by user.
  - That can give false positives and false negatives.
  - For example:
      a) If 'command' was set up with more than one spaces,
         like 'command=sleep  123', it would be never matched again
         with a container(s) launched by this task.
         Because after launching, command would be normalized and
         appear, in docker-py API call, just as 'sleep 123' - with one
         space. This is false negative case.
      b) If 'entrypoint + command = command', for example
         'sleep + 123 = sleep 123', module would give false positive
         match.

This patch fixes it, by making matching more explicit - against
'Config'->Cmd' field of 'docker inspect' output, provided by docker-py
API and with proper normalization of user input by splitting it to
tokens with 'shlex.split()'.
2015-10-02 12:30:03 +03:00
Mike
8c9a9c0802 update_disks(): added origins of the code. 2015-10-01 17:38:46 +01:00
Mike Christofilopoulos
83074ad501 add new disks automatically when the 'vm_disk' section changes 2015-10-01 17:29:21 +01:00
Matt Martz
45c5b4bf4b Merge pull request #1002 from vmihailenco/fix/rx-isdir-path
rackspace: pass full path to the isdir.
2015-10-01 10:59:43 -05:00
Brian Coca
da220e0bb0 added version_added 2015-10-01 00:13:58 -04:00
Nathaniel Felsen
8ec17d0fd9 Adding support for access logs in ELB 2015-09-30 18:02:47 -07:00
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.
2015-09-29 16:51:26 -07:00
Brian Coca
653b55bf68 Merge pull request #2160 from j-carl/fix_amazon-cloudformation-userdir
Fix to handle user directory within parameter 'template'.
2015-09-28 15:23:19 -04:00
Jens Carl
dc109387bd Change type of parameter 'template' to 'path'. 2015-09-28 18:25:23 +00:00
Shayne Clausson
841835ebac Replaces 'old' get_ec2_creds connection method with get_aws_connection_info to
support passing in security_token for temporary creds.
2015-09-28 19:50:02 +02:00
Toshio Kuratomi
a4ac171a07 Merge pull request #2124 from halberom/ec2_adjust_vol_handling
ec2 - allow use of volume_type in volumes dict
2015-09-28 09:04:12 -07:00
Gerard Lynch
1857263b63 allow use of volume_type in volumes dict 2015-09-28 17:02:46 +01:00
Toshio Kuratomi
d5f62798f0 Docs fixes 2015-09-28 08:22:36 -07:00
Toshio Kuratomi
6cad03644f Merge pull request #2130 from shawnsilva/modify-rds-size
Fix for modifying the size of an RDS instance.
2015-09-28 07:38:43 -07:00
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
2015-09-28 07:28:08 -07:00
Toshio Kuratomi
b28df8d600 Merge pull request #2127 from selivan/patch-1
ec2_group.py: added ICMP rule example
2015-09-27 12:06:25 -07:00
Jens Carl
e25605cd5b Fix to handle user directory within parameter 'template'. 2015-09-25 21:59:14 +00:00
Leonty
2080c8ab6e Support 'labels' parameter for docker. 2015-09-25 23:58:20 +03:00
David Shrewsbury
750a91520f Allow setting external attribute
With shade > 0.13.0, networks can be created that are externally
accessible. This adds a parameter for that.

Also, add RETURN documentation and 'if __name__' check around call
to main().
2015-09-25 14:58:47 -04:00
David Shrewsbury
d52bb67978 Allow complete router configuration
This change allows one to completely configure a router, including
gateway and interfaces, using the latest shade (>0.13.0).
2015-09-25 13:09:02 -04:00
dagnello
40974a9811 Adding new os_subnets_facts module
There can be instances during an Ansible play where the list of subnets
currently available from OpenStack is required.  This update provides
subnet list functionality as a new os_subnets_facts module.
2015-09-24 16:08:20 -07:00
dagnello
7d09437328 Adding os_networks_facts module
There can be instances during an Ansible play where the list of networks
currently available from OpenStack is required.  This update provides
network list functionality as a new os_networks_facts module.
2015-09-24 16:07:45 -07:00
Abitha Palaniappan
e64791ef1a os_server: Adding support to accept 'n' nic args as a string containing list 2015-09-24 14:00:27 -07:00
Tom Bamford
4e1d28e311 Clarify available options for device_mapping parameter of ec2_ami module 2015-09-24 12:37:03 +00:00
justnom
518ac36878 Adding additional Docker log drivers.
Adding additional `log_driver` choices:
* journald
* gelf
* fluentd

Compatible with Docker version >= 1.8.0
2015-09-23 11:54:51 -04:00
Matt Martz
e8227dea7a Merge pull request #1290 from jamiehannaford/rs-as-wait
Rackspace: Add wait and wait_timeout options for provisioning servers to Auto Scale
2015-09-22 16:17:18 -05:00
Shawn Silva
ba8930c83a Fix for modifying the size of an RDS instance.
When attempting to modify the size of an RDS instance Ansible succeeds and
returns a "changed" status. However, no changes are applied to the RDS
instance. Boto is looking for a keyword parameter of "allocated_storage" to
update the size, and this parameter wasn't being included.
2015-09-22 10:46:20 -04:00
Selivanov Pavel
ec24a86f69 ec2_group.py: added ICMP rule example 2015-09-22 16:56:13 +03:00
Brian Coca
8b7e692494 Merge pull request #1353 from awesomescot/devel
adding parameter group option
2015-09-21 08:31:40 -04:00
dagnello
842f09cf24 Adding new image facts module 2015-09-20 21:15:40 -07:00
Matias De Carli
854ffcb605 updated dependencies to work with azure.py 1.0.1 2015-09-19 15:19:28 -03:00
EC
9168ed4736 Fixing ec2_asg termination_policy
If this isnt set, it wont launch the instances because it needs to default to "Default" despite what boto docs say.
2015-09-17 15:47:16 -04:00
James Cammarata
d2c7d30c50 Merge pull request #250 from saito-hideki/bug/249
The nova_compute module create a list of un-use floating ip by value of fixed_ip
2015-09-17 11:25:35 -04:00
James Cammarata
64c0b67154 Merge pull request #1599 from emonty/feature/os_user_group
Add OpenStack Group content module
2015-09-17 11:22:56 -04:00
James Cammarata
b743224aa9 Merge pull request #1831 from tkinz27/os_start_stop
Adding start and stop actions to os_server_actions
2015-09-17 11:19:30 -04:00
Rob
9bf0d06e4a Update iam_policy.py
Fixed doc for policy_name - it is a required field
Removed empty aliases
2015-09-17 17:52:42 +10:00
Jumpei Ogawa
7b4b61faff Add explanation in case that ipv4_range is required 2015-09-17 15:37:07 +09:00
Jumpei Ogawa
08b09fcc70 Add better error message when specified network doesn't exist and ipv4_range is not specified 2015-09-17 15:31:14 +09:00
Philippe Jandot
8052d49b07 fix regression introduced by f38186ce8b, and propose a fix for docker facts 2015-09-16 16:49:09 +02:00
Gerard Lynch
3d12e53a28 order params, add missing tag param. update examples 2015-09-16 11:29:36 +01:00
whiter
719f68e057 Remove 'str' type so that json is properly quoted 2015-09-16 17:52:43 +10:00
Toshio Kuratomi
636eecf354 Fix improper indentation 2015-09-15 14:25:22 -07:00
Brian Coca
367b4f07a1 Merge pull request #2047 from tomfotherby/patch-1
Allow load_balancer_port as a Ansible variable
2015-09-15 11:15:36 -04:00
Brian Coca
4a8a54950c Merge pull request #2067 from wimnat/feature/issue-2066
Add exception handling to iam
2015-09-15 10:46:26 -04:00
James Cammarata
8125ae624a Merge pull request #2075 from evanccnyc/ec2_asgfix
fixing termination policies for ec2_asg
2015-09-15 10:29:34 -04:00
Evan Carter
2e84bb9c99 fixing termination policies for ec2_asg 2015-09-14 18:31:22 -04:00
Brian Coca
8a7946b91d Merge pull request #2064 from wimnat/feature/issue-2063
Remove unnecessary json.loads
2015-09-14 16:46:34 -04:00
David Shrewsbury
ef93fb1c14 More os_router module cleanup and fixes.
Added a RETURN section, corrected version_added value, removed use of
'result' in exit_json() calls.
2015-09-14 16:20:18 -04:00
Brian Coca
a0997e8940 Merge pull request #1757 from gutoandreollo/devel
Added the 'hw_interfaces' array
2015-09-14 15:08:47 -04:00
Brian Coca
b2e5dd2c47 Merge pull request #1807 from brannon/supportVMClones
Support cloning VMs (in addition to templates)
2015-09-14 14:26:48 -04:00
Evan Carter
70ed99ec26 Fixing bug #2058 and adding some backwards compatibility 2015-09-14 11:27:37 -04:00
Frank van Tol
a7667fcaf2 Update s3.py
We are copying from S3,  the bucket is the source, not the target.
2015-09-14 15:57:48 +02:00
Rob
da29956f03 Add exception handling to iam 2015-09-14 15:43:49 +10:00
wimnat
8e9c85bed2 Remove unnecessary json.loads 2015-09-14 14:23:34 +10:00
Brian Coca
beb60133ba Merge pull request #2042 from abithap/devel
Add support for port-id,port-name to nics in os_server
2015-09-10 21:15:23 -04:00
Tom Fotherby
54ae73b1a3 Fix #1984 - allow load_balancer_port as a variable 2015-09-10 17:34:38 +01:00
Brian Coca
05c3b3ea15 minor doc fix 2015-09-10 09:07:59 -04:00
Abitha Palaniappan
f449a0f48c Add support for port-id,port-name to nics in os_server 2015-09-09 15:38:39 -07:00
Brian Coca
1c7e8ef1a0 Merge pull request #2034 from pwnall/patch-2
Fix indentation in os_server documentation
2015-09-09 11:49:08 -04:00
Brian Coca
951f5807b9 Merge pull request #2028 from rosmo/s3-permissions
Added option to set multiple ACLs for S3 objects
2015-09-09 08:40:30 -04:00
Victor Costan
2cc431f791 Fix indentation in os_server documentation 2015-09-09 01:29:38 -04:00
Toshio Kuratomi
9363369a4c Merge pull request #1991 from daviddyball/devel
Docker module log-opt support
2015-09-08 13:27:36 -07:00
Taneli Lepp
15f4b59619 Added option to set multiple ACLs for S3 objects. Also verifies the
selected permissions against Boto's canned ACL strings list.
2015-09-08 20:00:14 +03:00
Brian Coca
c4140cc6db Merge pull request #2021 from h3biomed/enis_at_launch
ec2: allow ENIs to be specified at instance launch
2015-09-08 12:45:05 -04:00
Yanchek99
7104096c7c Fixed typo for instance_tags documentation 2015-09-08 09:16:53 -07:00
David Dyball
a0a374b8ca Updated PR based on comments 2015-09-08 16:19:26 +01:00
Bret Martin
27e9318ffe Use general-purpose parameter mutual exclusion code for network_interfaces 2015-09-06 14:00:35 -04:00
Bret Martin
44f3618dd3 Add alias network_interface and accept a string for a single ENI 2015-09-06 13:53:28 -04:00
Bret Martin
5db3f14e94 Add network_interfaces example 2015-09-06 13:18:20 -04:00
Bret Martin
a20a78a50c Remove aliases specification from documentation since there are none 2015-09-06 13:03:04 -04:00
Brian Coca
f1efc121ee corrected whitepace 2015-09-06 11:18:47 -04:00
Toshio Kuratomi
34655e8e29 correct documentation formatting 2015-09-05 08:56:02 -07:00
Victor Costan
2ae37e7845 os_server: nice error when flavor not found
When we can't find the VM flavor that the user requests, this change replaces the non-descript stack trace with a clear error message.
2015-09-04 20:46:26 -04:00
Bret Martin
eaa45dcbd9 Add network_interfaces parameter to ec2 module to support launch-time ENIs 2015-09-04 19:44:35 -04:00
Toshio Kuratomi
6e5a832dc2 Fix read-only usage to depend on the docker-py and docker server version 2015-09-04 15:59:19 -07:00
Toshio Kuratomi
a4149a37ba Merge pull request #2011 from ansible/docker-merge-hostconfig-methods
We had two separate methods trying to do the same thing but neither o…
2015-09-04 12:37:17 -07:00
Brian Coca
8f31323b5c Merge pull request #1862 from SinisterLight/devel
checking remote_group_id while comparing os_security_group_rule
2015-09-04 12:48:59 -04:00
Toshio Kuratomi
1f358f349b We had two separate methods trying to do the same thing but neither one was complete. This merges them so that all of the options get parsed and applied. 2015-09-03 15:39:18 -07:00
Toshio Kuratomi
2520627fe7 Make sure listener ports are ints.
May fix #1984
2015-09-03 08:47:27 -07:00
Benno Joy
2f42cd4b2c Merge pull request #1951 from galindro/ec2_asg_termination_policies
Added termination_policies option
2015-09-03 17:35:06 +05:30
James Martin
c54f875fdd Adds sanity check to make sure nics is a list. 2015-09-02 11:02:31 -05:00
Charles Paul
6a40e8b454 vm_floppy 2.0 support 2015-09-01 14:53:11 -05:00
Chrrrles Paul
8ebd6cc7cd Revert "Add 2.0 docs - Revert "add virtual floppy to VMware guest"" 2015-09-01 10:55:10 -05:00
Chrrrles Paul
3830af652f Revert "add virtual floppy to VMware guest" 2015-09-01 10:47:43 -05:00
Chrrrles Paul
943a892435 Merge pull request #1720 from nivanko/feature-virtual-floppy
Useful addition to vsphere_guest and the code looks good.  I will do more testing.  Merging into devel branch -- add virtual floppy to VMware guest
2015-09-01 09:26:20 -05:00
Benno Joy
26928dd7c6 Merge pull request #1990 from rickmendes/usability-enhancements
using single device_id and enabling release on disassociation
2015-09-01 18:00:11 +05:30
Benno Joy
b5db274362 Merge pull request #1940 from jcowley/s3-permissions
Add support for S3 canned permissions. resolves #1939
2015-09-01 09:15:15 +05:30
Toshio Kuratomi
06fc029f73 Remove non-ascii quote char 2015-08-31 15:09:50 -07:00
Rick Mendes
a18c96882e using single device_id and enabling release on disassociation 2015-08-31 09:06:18 -07:00
Chrrrles Paul
5fc4f9d876 Merge pull request #1982 from lowwalker/patch-2
Merging, good catch -- updated examples
2015-08-28 14:12:58 -05:00
Luke
40f2ff9fbf removed hyphens in module name in examples 2015-08-28 08:46:45 -04:00
Luke
a4aa29edd9 updated examples
When testing with existing example, I received errors about auth block not being ingested. After adding the auth block, name and state with "=" caused syntax errors.
2015-08-28 08:34:05 -04:00
Benno Joy
66288d48a2 Merge pull request #1703 from haad/ec2_start_stop_by_tag
Rebase start/stop by instance tag
2015-08-27 14:46:54 +05:30
Benno Joy
512b485a90 Merge pull request #1871 from evanccnyc/devel
Adding the ability to associate eips with network interfaces on Amazon EC2
2015-08-27 13:51:28 +05:30
Timothy Appnel
2ba32a8b10 Clarified and cleaned up grammar of error messages. 2015-08-26 11:59:31 -04:00
Timothy Appnel
0e42b1708b Fixed call to undefined attribute when RDS module timeouts waiting. 2015-08-26 11:58:16 -04:00
Yann Hamon
8f03f1e4e1 Docker module: restarted should update the container when necessary 2015-08-26 00:01:35 +02:00
Brian Coca
116793889f Merge pull request #1915 from leedm777/patch-1
ec2_vol: Added missing "needs 2.0" doc
2015-08-24 18:44:15 -04:00
Till Backhaus
39e7e05a8d Delete dead and broken code 2015-08-24 20:06:53 +02:00
Tony Kinsley
bd210e42bc Adding start and stop actions to os_server_actions
Also making the os_server module allow a server in the possible new
states from the os_server_actions changes
2015-08-23 11:51:28 -07:00
Omri Iluz
daf7a0551b No need for .keys on volumes list
Since c3f92cca21 changed "volumes" to be a list instead of a dictionary, we don't need (and cannot) .keys when appending to set.
Reported as bug #1957
2015-08-23 02:29:39 -07:00
James Cammarata
85ddb1b902 Fixing region requirement regarding euca clusters
Fixes ansible/ansible#11023
2015-08-22 12:32:40 -04:00
Bruno Galindro da Costa
f7f621839a Added termination_policies option 2015-08-21 14:13:09 -03:00
Sarah Haskins
b04efa22c4 Expose cache_parameter_group_name in elasticache module
The cache_parameter_group_name was not previously exposed in
elasticachy.py, I have exposed it, as optional.
2015-08-21 11:33:28 -04:00
Brian Coca
2af3f34d58 Merge pull request #1926 from cjchang/keystone_user
support creating role only
2015-08-21 00:07:14 -04:00
Brian Richards
e4a5f3b409 Preventing servers that are deleted and left in the deleted state from being included in the server list 2015-08-20 11:07:58 -05:00
Nithy Renganathan
4171d167f4 Handle the changed value 2015-08-20 14:24:05 +00:00
Jason Cowley
8215aad3b3 Add support for S3 canned permissions. resolves #1939 2015-08-19 11:40:07 -07:00
HAMSIK Adam
dfac073343 Rebase start/stop instance pull code 2015-08-18 14:32:48 +02:00
Mahesh Sawaiker
f459b3773c support creating role only 2015-08-17 16:28:18 +00:00
Ilya Epifanov
d951172920 fixed memory_limit for docker api version >= 1.19 2015-08-16 18:34:56 +03:00
David M. Lee
6a8108133d ec2_vol: Added missing "needs 2.0" doc
The ability to find-or-create a volume was added in 2.0. Added note to
the example.
2015-08-14 13:01:44 -05:00
Michael J. Schultz
63d7bbea19 Return an iterable instead of None
By default `.get()` will return `None` on a key that doesn't exist. This
causes a `TypeError` in the `for` loop a few lines down. This change simply
returns an iterable type to avoid the error.
2015-08-12 12:13:29 -05:00
Toshio Kuratomi
dea5f5d15e Another way that the serialization of the boto results can fail 2015-08-07 12:27:57 -07:00
Toshio Kuratomi
4c622a0338 Another launchconfig field needs to be explicitly converted for json serialization
Fixes #1848
2015-08-06 08:41:23 -07:00
HAMSIK Adam
f4228d81d2 Convert enabled value to boolean to actually work, make sure we can set expiration period to 0(None) to disable it 2015-08-06 16:51:36 +02:00
sebi
599d60efc0 mem_limit client version check 2015-08-06 16:46:01 +03:00
Brian Coca
016b4ede2e minor doc fix 2015-08-05 17:36:16 -04:00
Evan Carter
06e722900e Adding the ability to associate eips with network interfaces 2015-08-05 14:34:33 -04:00
Shobhit Srivastava
8ad072c96f checking remote_group_id while comparing os_security_group_rule 2015-08-04 12:52:56 +05:30
Brian Coca
762e43c50f Merge pull request #1860 from tedder/patch-1
fix ugly documentation
2015-08-03 12:56:04 -04:00
Toshio Kuratomi
1001eae3c8 Set a default value for DEFAULT_DOCKER_API_VERSION so we can create the AnsibleModule without docker-py 2015-08-03 08:44:48 -07:00
Ted Timmons
40519de8e7 fix ugly documentation
current version dumps a character per line in the docs: http://docs.ansible.com/ansible/cloudformation_module.html
2015-08-01 17:30:15 -07:00
Robert Jailall
d10f3f7a7e Refactor ec2_snapshot to make it more testable 2015-08-01 08:11:17 -07:00
Hagai Kariti
1f447ad5ba made wait default to True in ec2_snapshot 2015-08-01 07:54:15 -07:00
Hagai Kariti
a91db23b56 Add to the ec2_snapshot module the ability to create a snapshot only if one hasn't recently been created
- Added snapshot_max_age parameter
- Updated docs
- Made the default value of wait to be false, as it used to be
2015-08-01 07:54:15 -07:00
Toshio Kuratomi
42d3d02855 Merge pull request #51 from cewood/ec2-group/cidr-ip-list
Support specifying cidr_ip as a list
2015-08-01 07:45:38 -07:00
Toshio Kuratomi
be468ff9d3 result is now a dict and so needs different access syntax
Fixes #1848
2015-07-31 20:58:04 -07:00
Toshio Kuratomi
4928357667 Remove unneeded urllib2 import 2015-07-31 20:58:04 -07:00
Brian Coca
1268a83eb7 Merge pull request #1782 from civisanalytics/iam_dont_delete_passwords_silently
iam: don't delete passwords by default
2015-07-30 19:51:57 -04:00
James Cammarata
79f21c6ec9 Fix missing params to download_s3file in s3 2015-07-30 14:49:45 -04:00
Brian Coca
697307f88c Merge pull request #1670 from mikeputnam/issue-1643-gpl-header
Add missing GPLv3 License header
2015-07-30 14:39:44 -04:00
James Cammarata
4c4e978360 Fixing s3 failures when bucket names contain dots 2015-07-30 13:47:01 -04:00
Brian Coca
c6da9d0758 added missing version_Added to extra_hosts
fixes #1843
2015-07-30 13:05:00 -04:00
Brian Coca
d6b9989c71 Merge pull request #1820 from jaimegago/patch-1
Fix example indentation bug
i seem to have misread the patch, i thought it was doing the contrary of what it was. Sorry, merging it in now.
2015-07-30 09:52:00 -04:00
Toshio Kuratomi
2785364ebe Merge pull request #1736 from larsks/bug/docker-version-parse
docker: fix parsing of docker __version__ string
2015-07-29 12:36:37 -07:00
Cameron Wood (@cewood)
4241d940b7 Support specifying cidr_ip as a list
Update/fix to Support specifying cidr_ip as a list

Unicode isn't compatible with python2, so we needed some other
solution to this problem. The simplest approach is if the ip item
isn't already a list, simply convert it to one, and we're done.
Thanks to @mspiegle for this suggestion.
2015-07-29 19:11:43 +10:00
Brian Coca
49400d90ac Merge pull request #1830 from ecliptik/devel
Fix incorrect var name for api_version
2015-07-28 18:25:20 -04:00
Micheal Waltz
b43f236b05 Fix incorrect var name for api_version 2015-07-28 15:11:33 -07:00
Luke Rohde
88a0d79873 Use msg kwarg to pass error message in ec2_snapshot 2015-07-28 16:02:49 -04:00
Brian Coca
c579f53a15 Merge pull request #1818 from j2sol/no_ipv6_update_subnet
Handle non-updatable openstack subnet details
2015-07-28 15:00:30 -04:00
Brian Coca
92f32a0253 added version added to headers in s3 2015-07-28 14:50:39 -04:00
Brian Coca
8227b48a6a minor doc fixes 2015-07-28 14:50:01 -04:00
Brian Coca
4b78b5597f Merge pull request #160 from acaire/s3-headers
S3 headers
2015-07-28 14:48:51 -04:00
Jaime Gago
1f62f5f580 Fix example indentation bug 2015-07-27 23:40:49 -07:00
Brian Coca
cb90735b2a Merge pull request #1795 from feanil/feanil/s3_overwrite_early
If overwrite is set, download eagerly.
2015-07-27 22:34:58 -04:00
Brian Coca
dbdbcb33cc defined DEFAULT_DOCKER_API_VERSION to avoid it erroring out before we send the message that docker.py is missing 2015-07-27 22:33:15 -04:00
Brian Coca
44d23ababd Merge pull request #1767 from ecliptik/devel
Use proper HostConfig element which contains the proper Memory value …
2015-07-27 18:23:33 -04:00
Brian Coca
d91834bdf5 Merge pull request #1763 from larsks/bug/missing-mem-limit
restore mem_limit
2015-07-27 18:22:37 -04:00
Jesse Keating
84dfcf3690 Handle non-updatable openstack subnet details
Some things cannot be updated via the API, so check for those and fail
if the user is wanting to update them. Also don't try to update ipv6
stuff, as that doesn't work and will cause a traceback.
2015-07-27 14:54:29 -07:00
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
Scot Spinner
abf2083671 one thing missed 2015-07-24 14:11:53 -07:00
Scot Spinner
b47bbfad1b merging with ansible devel 2015-07-24 14:10:20 -07: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
Hideki Saito
a2979a3102 The nova_compute module create a list of un-use floating ip by value of fixed_ip.
Fixes #249
2015-07-14 13:48:42 +09: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
Jamie Hannaford
8dbdfff366 Add wait and wait_timeout options for provisioning servers 2015-07-13 10:54:07 +02: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
Mehul Ved
cd587ebce1 renamed variables type to cdb_type and version to cdb_version. 2015-07-10 16:50:42 +05:30
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
Mehul Ved
d1978c33dc Added support for instance types.
Added type and version parameters to be passed to rax_cdb module
so users can create Percona and MariaDB instance types.
2015-07-09 18:50:14 +05:30
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
David Shrewsbury
653060dc47 Update os_router to the latest version
This version uses the latest shade for a cleaner interface,
support for check mode, and updating an existing router.
2015-07-03 10:26:08 -04:00
Monty Taylor
edce6a41cf Add OpenStack Router module
Also deprecate old quantum_router module
2015-07-03 10:26:07 -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
Matt Ferrante
8cb4b7b01c ec2_ami can update an ami's launch_permissions 2015-07-01 17:46:13 -04: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
David Shrewsbury
7970924bd5 Use newest documentation style for return value. 2015-06-29 15:55:15 -04:00
Jonathan Davila
def5fdcb21 no_log to iam password 2015-06-29 15:14:50 -04:00
David Shrewsbury
e6fc129013 Add a note about the return value. 2015-06-29 14:49:13 -04:00
Scott Miller
692045f693 update docs for cloudformation 2015-06-29 14:15:23 -04:00
Monty Taylor
7b0b75ceed Fix dict syntax typo 2015-06-29 10:34:24 -04:00
whiter
786ec1dca1 ec2_vpc_net refactor 2015-06-29 09:32:45 +10:00
Kamil Madac
f9a6c898b4 Fixed bug, when MX records pointed to ORIGIN(@) caused unintentional change of random A record. 2015-06-28 21:50:11 +02:00
Robb Wagoner
5e674ddcfc include all launch config properties in the return
make all properties available when registering the result
which is useful when wanting to launch a stand-alone instance based upon
an existing Launch Config.
2015-06-26 15:51:41 -07:00
Robb Wagoner
d651b41691 return health of instances and counts 2015-06-26 15:39:08 -07:00
Brian Coca
e864576f14 Merge pull request #1133 from defionscode/ec2_vpc2
New vpc module. does not contain subnet or route table functionality.
2015-06-26 16:15:15 -04:00
Davide Guerri
304e187a52 Fix reuse argument documentation 2015-06-26 14:53:48 +01:00
Davide Guerri
e3d9b51cbb Update os_floating_ip with new shade methods 2015-06-26 12:53:20 +01:00
Simon Olofsson
dc3161dfdd Add option docker_user for docker module.
docker_user can be used to specify the user or UID to use within the
container.
2015-06-26 00:18:56 +02:00
Ash Wilson
29e4a127e1 Default net to 'bridge' in container diff
This prevents an unnecessary reload when the `net` parameter is unspecified
(i.e. almost always).
2015-06-25 17:11:38 -05:00
Patrick Roby
e90d02c35c iterate through all keys in a more pythonic manner 2015-06-25 10:37:17 -07:00
Patrick Roby
8ba96aaf4b update documentation, adding new params 2015-06-25 10:36:07 -07:00
David Shrewsbury
bed420cd53 Update os_keypair for latest shade
Uses the latest version of shade for cleaner code. Also, always
return the key dict whether we create the key, or it already exists.
The example using public_key_file is corrected to use a full path
since ~ is not converted for us.
2015-06-25 12:19:20 -04:00
Toshio Kuratomi
964d731722 Add version_added documentation to log_driver parameter 2015-06-25 08:29:42 -07:00