Commit graph

2634 commits

Author SHA1 Message Date
Constantin07
9e42b2a684 Fixing issue #3057 - AttributeError: 'str' object has no attribute 'items' 2016-02-17 22:09:02 +00:00
Tom Bamford
5749454723 Bugfix: Permit SOA record type 2016-02-17 06:29:53 +02:00
Matt Martz
4e594a9196 Merge pull request #3050 from sivel/module-cleanup
Various simple linting type cleanups on modules
2016-02-16 16:03:34 -06:00
Matt Martz
c7845456a6 Various simple linting type cleanups on modules 2016-02-16 15:58:44 -06:00
Brian Coca
7fb2818048 Merge pull request #3002 from MikeCaspar/devel
Documentation Adjustments for Digital Ocean module
2016-02-15 15:46:44 -05:00
Pete Travis
363e459cb9 quote fail 2016-02-13 20:34:18 -06:00
Pete Travis
d5242e4016 expand when opening too 2016-02-13 20:33:19 -06:00
Pete Travis
7cfa625a31 use expanduser() before testing user_data as file
I like to use ~/somepath instead of absolute paths because
that's more shareable.  Without expansion, the path wasn't
considered a file, and the resulting cloud-config user_data
contained a string for the file path instead of the file context.
So, expand it.
2016-02-13 20:22:13 -06:00
David Shrewsbury
f71542ccf2 Fix parameters where type is assumed.
A change is coming to Ansible where module params will default to str.
Many of our modules were taking advantage of this by not being explicit
about the type, so they will break when that change merges. This hopefully
catches those cases.
2016-02-12 12:30:52 -05:00
Jason Kohles
80d8277521 Enable env vars for vsphere_guest
This commit allows the connection information for
the vsphere_guest module to be provided as environment
variables, which makes it possible to use Cloud
Credentials from Ansible Tower in playbooks that utilize
vsphere_guest.

| ENV VAR         | vsphere_guest param    |
| --------------- | ---------------------- |
| VMWARE_HOST     | vcenter_hostname       |
| VMWARE_USER     | username               |
| VMWARE_PASSWORD | password               |
2016-02-10 12:42:44 -05:00
Mike Caspar
7cc00bddc0 Documentation updates to use complete YAML : syntax instead of key=val syntax.
Adjusted example to use "" where appropriate to pass YAML Syntax checker per Contribution guidelines.

See Issue [# 2879](https://github.com/ansible/ansible-modules-core/issues/2879)
2016-02-10 10:02:38 -05:00
Daan Oosterveld
90153a2ca5 Adds ulimit to the docker module
The ulimit will be specified as a list and separated by colons. The
hard limit is optional, in which case it is equal to the soft limit.

The ulimits are compared to the ulimits of the container and added
or adjusted accordingly on by a reload.

The module ensures that ulimits are available in the capabilities
iff ulimits is passes as a parameter.
2016-02-10 10:31:54 +01:00
Monty Taylor
5f925d061b Add user_data alias for userdata in os_server
The old nova_compute module called the parameter user_data - having an
alias to the old name is friendly.

Fixes Issue #2920
2016-02-09 07:51:08 -06:00
Konstantin Suvorov
d9f13a0bbc Fix docker container restart
restart_containers(containers.running) may try to restart containers
that are deleted when looping through get_differing_containers()
fix this by refreshing list after first loop
2016-02-09 15:34:30 +03:00
jjshoe
b0cbae51b5 Less engrish 2016-02-08 19:03:35 -06:00
Michael Baydoun
98c16a4f1f Update ec2.py
Documentation is not clear that tag used in count_tags must be an existing instance_tag
2016-02-08 19:14:19 -05:00
Brian Coca
c68a790369 corrected description key spelling 2016-02-08 13:33:33 -05:00
James Cammarata
b804edfbe3 Merge pull request #2852 from awasilyev/check_tag
docker: fix failing in case of empty image tag
2016-02-08 12:44:24 -05:00
James Cammarata
e2f8ed1609 Merge pull request #2735 from noqcks/no-default-sec-groups
Elasticache Module: changing default cache_security_group to none
2016-02-07 21:43:35 -05:00
James Cammarata
4089f4af30 Fixing user_data version_added
Fixes #2634
2016-02-07 15:27:27 -05:00
Scott Brown
2f329f832e Fixing missing interpolation variable 2016-02-05 14:35:50 -08:00
Toshio Kuratomi
f5cdcfa1d9 Make validate_certs for vsphere_guest work with older python2 2016-02-05 13:17:18 -08:00
Tobias Gesellchen
60e37e6fda add env_file support (original code from @vpetersson) 2016-02-05 14:59:24 +01:00
Ashwanth Kumar
3150c094b5 Doing exponential backoff on route53 upon AWS throttling 2016-02-05 13:27:55 +05:30
Stewart Rutledge
c24f758a02 Changed insecure to validate_certs, with a default to true from false (reversing behavior) 2016-02-04 08:16:35 +01:00
Stewart Rutledge
c13efdbd2b Added support for insecure parameter 2016-02-04 08:16:35 +01:00
David Shrewsbury
092791dc2c Fix for os_server module when specifying region
Fix the OpenStack os_server module for when region_name is specified.
This should not be passed through to the shade create_server() call
as it's only used with the auth parameters.

Fixes bug: https://github.com/ansible/ansible-modules-core/issues/2797
2016-02-03 09:52:18 -05:00
Toshio Kuratomi
29b81a4153 Merge pull request #2826 from shawnsilva/cloudformation-req-params
The parameters 'template' and 'template_url' are incorrectly required in all cases in the cloudformation module
2016-02-02 13:27:30 -08:00
Ryan-Neal Mes
c30bca6808 Indented code so it only executes tag comparison for matching cird values 2016-02-01 13:58:12 +02:00
Toshio Kuratomi
93d02189f6 Remove duplicate documentation fields 2016-01-28 09:24:20 -08:00
Brian Coca
cdfb578b60 Merge pull request #2646 from h1ppo/patch-2
updating choices for rds parameter engines
2016-01-25 23:46:12 -05:00
Brian Coca
382ae8f15f Merge pull request #2800 from noqcks/iam-grammar-issue
IAM Module: fixed grammatical issue in iam.py. exit -> exist.
2016-01-25 23:39:57 -05:00
Brian Coca
a75fa8df05 added missing version_added 2016-01-25 23:43:46 -05:00
Brian Coca
d2c50688de Merge pull request #2814 from Shrews/purge_fip
Add purge option to os_floating_ip module
2016-01-25 23:38:58 -05:00
Brian Coca
5e38b0e0c1 added missing version_Added 2016-01-25 23:42:04 -05:00
Brian Coca
1ebe143618 Merge pull request #2829 from juliakreger/add-os-ironic-node-wait
Add wait support to os_ironic_node
2016-01-25 23:37:07 -05:00
Yair Fried
2692e494e5 Fix glance_client module
Wrong variable name.
2016-01-25 14:49:37 +02:00
Alexey Wasilyev
511ce25ac8 docker: fix failing in case of empty image tag 2016-01-21 11:53:39 +03:00
Kanwei Li
92ad137d46 Add new Dv2 Azure instances 2016-01-19 10:38:33 -06:00
techraf
2016d3d822 Fixed typo in example playbook 2016-01-19 20:45:50 +09:00
Brian Coca
08135a9cf8 Merge pull request #2778 from sunnyone/fix-iam-policy-pdoc-treatment
Fix iam_policy pdoc variable assignment
2016-01-18 21:21:19 -05:00
Brian Coca
ffea58ee86 Merge pull request #2817 from atplanet/ec2-ami-find-fix-region
Remove explicit region parameter from ec2_ami_find
2016-01-18 20:48:29 -05:00
Brian Coca
0d1a154fac Merge pull request #2805 from Shrews/fix_os_server_exc
Fix OpenStack module failure output
2016-01-18 20:46:22 -05:00
Brian Coca
e826f5071e Merge pull request #2241 from daniel-sc/devel
Allowing to specify specific external ip for gce instances
2016-01-18 20:33:44 -05:00
Brian Coca
18bad1f691 tabs are bad 2016-01-18 17:10:29 -05:00
Henrique Rodrigues
b8d2a3d3b4 Fix misspelling of the word 'certificate' 2016-01-18 16:41:44 +00:00
Brian Coca
fbaf4fb628 Merge pull request #2746 from ferrants/patch-2
updated s3 module documentation
2016-01-18 11:17:09 -05:00
Brian Coca
9c80b1adb7 added note about awslogs version added 2016-01-18 09:16:38 -05:00
Brian Coca
b96cd854da Merge pull request #2437 from j3ffrw/devel
add awslogs option in docker module log driver
2016-01-18 09:11:36 -05:00
Brian Coca
618f74f35f added version_added 2016-01-18 08:25:32 -05:00
Brian Coca
ce8da38364 Merge pull request #2324 from Constantin07/update_ec2_vol
ec2_vol.py - Added 'delete_on_termination" option for volume attachment action
2016-01-18 08:20:26 -05:00
Julia Kreger
9c7c9e8573 Add wait support to os_ironic_node
Add support for the os_ironic_node module to be capible of waiting
until the baremetal node activation or deactivation has completed.
2016-01-17 17:42:46 -05:00
Shawn Silva
f410f44c28 The parameters 'template' and 'template_url' are incorrectly required in all cases.
If the state is 'absent' they should not be required. A few lines below the correct check is already in place.
2016-01-16 13:09:58 -05:00
jefferson fermo
028ecad9d4 add awslog option in docker log driver. this option is available starting with ansible 2.1 2016-01-16 23:22:20 +08:00
Ben Visser
18fdea8aba changing default of cache_security_groups to none, removing the ['default']
OCD is making me fix the inconsistency with how None is typed. First Letter Capitalized All Over Now.

cleaning up the default object that was created for the cache_security_groups and removing checks dealing with it.

clean up space

Changing default cache_security_groups from [default] to None.
2016-01-15 13:56:07 -05:00
Brian Coca
1a298f7948 updated s3 docs to reflect mode choices
fixes #2318
2016-01-15 00:44:29 -05:00
autotune
f769305bd4 1113 fix ec2 subnet tags 2016-01-14 16:17:36 -08:00
Tom Bamford
14377c9857 Remove explicit region parameter from ec2_ami_find 2016-01-14 23:30:27 +00:00
David Shrewsbury
42ed6124d4 Add purge option to os_floating_ip module
Add the ability to completely delete a floating IP from the pool
when disassociating it from a server. When state is absent and
purge is true, the IP will be completely deleted. The default
keeps the current behavior, which is to only disassociate the IP
from the server.
2016-01-14 13:48:37 -05:00
Brian Coca
34aa679f41 Merge pull request #2734 from noqcks/elasticache-engine-choices
Elasticache Module: cache engine choices
2016-01-14 09:21:25 -05:00
Brian Coca
fd59dccdd7 Merge pull request #2681 from timrchavez/pass_network_argument
Pass network argument to add_ips_to_server
2016-01-13 17:32:34 -05:00
David Shrewsbury
e8abea25c7 Fix OpenStack module failure output
The exception message, when shade fails, will contain much more
specific information about the failure if the exception is treated
as a string. The 'message' attribute alone is usually not helpful.
2016-01-13 11:15:24 -05:00
Ben Visser
04d1c63358 two choices for cache engine. adding them.
revert spacing

undoing quotes around default. will do another pull requests

Making documentation more explicit for elasticache engine choices.
2016-01-12 23:07:55 -08:00
Ben Visser
593e74cfc5 fixed grammatical issue in iam.py. exit -> exist. 2016-01-12 15:18:30 -08:00
daniel-sc
44af735ac4 Allowing specifying ip by address 2016-01-12 22:57:31 +01:00
daniel-sc
a757af0264 Allowing to specify specific external ip for gce instances 2016-01-12 22:57:31 +01:00
Brian Coca
59f3b82898 Merge pull request #2633 from andmarios/devel
fix: don't set scopes' account to service account used for gce instance creation
2016-01-12 10:50:09 -05:00
Brian Coca
4d60f963be Merge pull request #2543 from krdlab/fix-ec2_elb_lb-status
Fix `self.changed` value in `ElbManager` (ec2_elb_lb)
2016-01-12 10:48:15 -05:00
Brian Coca
9d4403f2b3 Merge pull request #2521 from wrouesnel/docker_reloaded_fixes
docker: Fix state=reloaded to detect default LoggingDriver for docker
2016-01-12 10:47:30 -05:00
Brian Coca
e277a9b1b9 Merge pull request #2375 from bcoca/rds_port_defaults
made port default depending on db engine
2016-01-12 10:46:55 -05:00
Brian Coca
afdd4c3a20 updated version_added 2016-01-12 09:33:58 -05:00
Brian Coca
b0542e6959 Merge pull request #2790 from jcassee/feature/route53-wait
Add wait option to route53 module
2016-01-12 09:28:58 -05:00
Brian Coca
061da7dc05 updated version_added 2016-01-12 08:27:33 -05:00
Joost Cassee
4a6d323b9e Add wait_timeout option to route53 module
This option is used to make sure the module does not block forever.
2016-01-12 13:49:20 +01:00
Joost Cassee
1bcb90e785 Add wait option to route53 module
This option makes the module wait for the changes to replicate to all
Amazon DNS servers.
2016-01-12 13:47:05 +01:00
Alexey Wasilyev
d61772807c Add cpu_shares option for docker module 2016-01-12 09:59:36 +03:00
Brian Coca
1b8487ffce Merge pull request #2753 from jonhadfield/return_allocation_id
return allocation id for address created in vpc
2016-01-11 18:49:31 -05:00
Brian Coca
c284727eeb Merge pull request #2740 from Labutin/fix_doc_os_object
Fix issue #2721: os_object parameters and docs don't align (file/filename)
2016-01-11 18:47:19 -05:00
Brian Coca
e5d0c015eb Merge pull request #2715 from viglesiasce/gce-json-credentials
Use JSON credentials for GCE modules
2016-01-11 18:36:21 -05:00
Brian Coca
4d19ee903c crrected version added 2016-01-11 18:27:37 -05:00
Brian Coca
316749c653 Merge pull request #2548 from Etherdaemon/propose_wait_for_removed_ec2_elb_lb
wait_for to ensure ELB has been removed from AWS
2016-01-11 18:22:16 -05:00
Brian Coca
b2c94d0eab corrected version added 2016-01-11 18:16:07 -05:00
Brian Coca
18284d18a3 Merge pull request #2489 from jimbydamonk/evaluate_targe_health
Add evaluate taget health for alias based records
2016-01-11 18:11:27 -05:00
Brian Coca
4be34067de added versions note in description for new choice 2016-01-11 18:14:37 -05:00
Brian Coca
c1df014e3b Merge pull request #2485 from sebi-hgdata/sebi/docker_unless_stopped
added unless stopped option to docker module
2016-01-11 18:09:24 -05:00
Brian Coca
94101a7271 Merge pull request #2398 from luto/feature/vsphere_guest/facts_power_status
vsphere_guest: add power status to facts
2016-01-11 18:04:23 -05:00
Brian Coca
f1754fb51e Merge pull request #2376 from mtpereira/fix_2351
Add support for legacy registries to pull_image().
2016-01-11 18:03:51 -05:00
Brian Coca
d2c520de91 Merge pull request #2789 from dddpaul/docker_timeout
Add "timeout" option to Docker module
2016-01-11 17:57:44 -05:00
Matt Davis
068c55ea0e Merge pull request #2711 from tksarah/azure_modify
Fix azure.py, "ResetPasswordOnFirstLogon parameter is deprecated"
2016-01-11 11:33:34 -08:00
Bermudez, Jaime
2ad0be9425 Merge branch 'devel' into feature/iam_policy_present_state_includes_policy_changes
Conflicts:
	cloud/amazon/iam_policy.py
2016-01-11 13:13:33 -05:00
Brian Coca
f312f48937 Merge pull request #2759 from chrrrles/nolog
adding no_log to vsphere_guest password
2016-01-11 09:33:00 -05:00
Pavel Derendyaev
61fdb52039 Add "timeout" option to Docker module 2016-01-09 21:59:23 +03:00
Sebastien Couture
22b6e6a0ce moved code that gets the vm's current hard drive profile and checks if vm_disk definition count is higher than actual vm drive count out of for loop for efficiency 2016-01-08 17:22:50 -05:00
Yoichi Imai
00376af7d6 Fix iam_policy pdoc variable 2016-01-08 13:05:31 +09:00
Constantin07
56fa475dcb Added delete_on_termination option for volume attachment 2016-01-07 12:14:10 +00:00
Brian Coca
b08cf6b94f Merge pull request #2730 from bcoca/iam_policy_json
be smarter when dealing with policy_json input
2016-01-04 10:19:38 -05:00
Jon Hadfield
0320411d03 return allocation id for vpc address. 2016-01-02 11:16:46 +00:00
Matt Ferrante
2c75e72e83 updated s3 module documentation 2015-12-30 20:04:41 -05:00
Dmitry Labutin
35d32c9378 Fix issue #2721: os_object parameters and docs don't align (file/filename) 2015-12-29 10:31:14 +03:00
Ben Visser
410ee32770 staging that num_nodes is required when state=present 2015-12-25 23:14:04 -07:00
Brian Coca
1fe6479617 be smarter when dealing with policy_json input
Now module will assume that if the argument is a string it is already formated as json
and will only try to convert non strings into json string.
Also removed unused 'msg' var declarations and the ifs that set them
fixes #2009
2015-12-24 00:18:21 -05:00
Sebastien Couture
080b158a29 Added support for resizing disks when state is 'reconfigured' 2015-12-23 15:42:00 -05:00
Vic Iglesias
5a0965cfcd Update GCE PEM deprecation text and examples 2015-12-23 11:37:12 -08:00
Marios Andreopoulos
d3ef2ef11f fix: do not set scopes account to service account used for instance creation 2015-12-22 19:54:05 +02:00
Brian Coca
907b7f7cf4 fix bad linebreak 2015-12-22 11:08:43 -05:00
Charles Paul
5e91c7b4d4 adding no_log to password 2015-12-22 10:01:01 -06:00
Michael Scherer
90f8228fb1 Fix #2629, replace choices=BOOLEANS by type='bool' 2015-12-22 16:10:01 +01:00
Vic Iglesias
6cbcb8f8ae Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into HEAD 2015-12-21 12:20:50 -06:00
Vic Iglesias
ec178225b0 Use credentials_file for GCE module auth config 2015-12-21 12:09:29 -06:00
Sam Thursfield
6e9adc4687 os_server: Add some error checking for the 'nics' parameter
If this parameter was not of the right type, the module would fail with a
traceback, with a "AttributeError: 'str' object has no attribute 'get'"
exception.

It now gives a proper error message on type errors.
2015-12-21 12:53:43 +00:00
sebi
aa15231cb7 added unless stopped option 2015-12-21 11:55:06 +02:00
tksarah
e022b7418e Edit azure.py 2015-12-20 11:10:39 +00:00
tksarah
215632d565 Edit azure.py 2015-12-20 10:15:01 +00:00
Toshio Kuratomi
fcb3397df7 Fix up documentation 2015-12-18 22:22:55 -08:00
Toshio Kuratomi
15c1c0cca7 entrypoint feature added in 2.1 2015-12-18 21:28:01 -08:00
Toshio Kuratomi
2220dc8e12 Merge pull request #2185 from AndrewPashkin/add_entrypoint_param_to_docker_module
Add entrypoint parameter to docker module
2015-12-18 21:25:14 -08:00
Toshio Kuratomi
ba3ee25172 labels is actually not aded in 1.9.4 but in 2.1 2015-12-18 17:57:17 -08:00
Omar Khan
19ebc45364 Add stop_timeout option to docker module 2015-12-18 17:51:31 -08:00
Toshio Kuratomi
d907f889a3 Merge pull request #1972 from yannh/docker-restarted
Docker module: restarted should update the container when necessary
2015-12-18 17:42:35 -08:00
Toshio Kuratomi
d6d3a8b21c Merge pull request #1903 from andynelson/extra-route-targets
ec2_vpc module update (eni and vpc peering connections & return state on termination)
2015-12-18 17:36:13 -08:00
Toshio Kuratomi
5fe0fbbf20 Merge pull request #1883 from haad/ec2_elb_fixes
Two fixes for ec2_elb_lb module to make stickiness work with undefined expiration period
2015-12-18 17:33:05 -08:00
Toshio Kuratomi
581b4f6de6 Add version_added to documentation 2015-12-18 16:34:16 -08:00
Joe Quadrino
8fe5d6f7ef add devices parameter for docker module 2015-12-18 16:34:16 -08:00
Pedro Romano
1bd04f797e GCE libcloud 0.15 support and code cleanup
* Code formatting (indentation and white space) fixes for improved PEP8 conformity.
* Remove redundant backslashes inside parentheses.
* Test for object identity should be 'is not None'.
* Test for membership should be 'not in'.
* Fit docstring to the PEP8 79 character limit.
* Use forward compatible Python 2.6+ 'except .. as' syntax for exception handling.
* Support libcloud > 0.15 'metadata' argument format.
2015-12-18 16:23:12 -08:00
Brian Coca
23c4297c96 Merge pull request #2703 from agireud/fix_boot_volume
Update root_volume variable
2015-12-18 09:21:29 -05:00
Chrrrles Paul
92fd2a9436 Merge pull request #2564 from luto/feature/vsphere_guest/support_nested_folders
vsphere_guest: support putting a guest into a nested folder
2015-12-17 11:47:08 -06:00
Alberto Gireud
9cc67e45a6 Update root_volume variable 2015-12-17 07:21:17 -06:00
Toshio Kuratomi
f04cd88d22 Fix os_server docs build 2015-12-16 08:06:29 -08:00
Donovan Jones
cf061dd93a fix typo in os_server security_groups description 2015-12-16 15:20:55 +13:00
Chrrrles Paul
e252fffb92 Merge pull request #2689 from tsmolka/patch1
Making cluster parameter optional
2015-12-15 14:32:44 -06:00
Brian Coca
6b13da738b updated module docs, added choices to state 2015-12-15 08:43:49 -05:00
Brian Coca
a6223ba43c Merge pull request #2577 from emonty/pass-volume-args
Pass volume args to OpenStack Server creation
2015-12-15 08:34:29 -05:00
Brian Coca
4e8d04d248 Merge pull request #2159 from leonty/devel
Support 'labels' parameter for docker.
2015-12-15 08:32:37 -05:00
Monty Taylor
187a4bd505 Add support for network, boot_from_volume and volumes
nics is a great flexible parameter, but it's wordy. Shade now supports
a simple parameter too, which is just "network" and takes a name or id.
Add passthrough support.

In addition to supporting booting from a pre-existing volume, nova and
shade both support the concept of booting from volume based on an image.
Pass the parameters through.

Shade supports boot-time attachment of additional volumes for OpenStack
instances. Pass through the parameter so that ansible users can also
take advantage of this.
2015-12-15 07:32:28 -05:00
Tobias Smolka
0cacadb670 Making cluster parameter optional 2015-12-15 12:45:51 +01:00
Brian Coca
1590f49618 Merge pull request #2655 from traveloka/fix-ec2-vol
Set the argument type for ec2_vol's encrypted parameter
2015-12-14 23:10:27 -05:00
Brian Coca
a876704740 Merge pull request #2239 from boushley/devel
Fix issue with comparing versions improperly
2015-12-14 21:59:27 -05:00
Brian Coca
0250ea1507 Merge pull request #2097 from phanect/gcenet-errormsg
Error message & doc improvement for ipv4_range
2015-12-14 21:38:27 -05:00
Timothy R. Chavez
05e16c950d Pass network argument to add_ips_to_server
The `network` argument needs to be passed through `add_ips_to_server`
so that the default value can be properly overridden from ansible.
2015-12-13 09:30:20 -08:00
Brian Coca
ed43b66d77 made note that Z/z are only 2.1 options 2015-12-12 13:04:01 -05:00
Brian Coca
38d651fb82 Merge pull request #2455 from solidm/selinux
Add support for 'z' and 'Z' option for volumes for selinux hosts
2015-12-12 12:59:27 -05:00
Brian Coca
f680076686 Merge pull request #2663 from timrchavez/fix_add_ips_to_server
Get new server object after adding floating IP
2015-12-11 15:04:17 -05:00
Chrrrles Paul
a56d652c7b Merge pull request #2196 from fennm/vmware_clone_to_folder
Support cloning VMs into a specific VM folder
2015-12-11 09:52:42 -05:00
Chrrrles Paul
b4254fe1a4 Merge pull request #2182 from serialdoom/devel
vsphere: automatically add new drives
2015-12-11 09:47:45 -05:00
Timothy R. Chavez
b9fe8166fd Get new server object after adding floating IP
We need a new server object once we add the floating ip, otherwise we
will be operating with the older server object pre-floating-ip
assignment.
2015-12-10 13:01:57 -06:00
Michel Alexandre Salim
18f4f5dcc6 Set the argument type for ec2_vol's encrypted parameter
If this is not set, Ansible parses the parameter as a string.
This is fine if the parameter is not provided by the caller, but
if it is set to False or True explicitly, ec2_vol receives this as
the string 'False' or the string 'True', both of which are truthy.

Thus, without this fix, setting the parameter results in encryption
always enabled.
2015-12-09 10:14:06 +07:00
Vladimir Mihailenco
366e6ab360 rackspace: set headers when uploading files to CF.
Otherwise CDN (Akamai) downloads file without the headers. The sequence
is following:
1. Ansible uploads file to CF.
2. Akamai downloads the file and caches it in CDN.
3. Ansible sets headers.

As a result Akamai serves file without headers.

This is backwards incompatible change, because headers keys are not
prefixed with `x-object-meta-`. Which allows user to set headers like
`Access-Control-Allow-Origin`.
2015-12-08 18:11:37 +02:00
Jason Paige
cc0ee4ad40 updating choices for rds parameter engines 2015-12-08 10:31:53 +00:00
Etherdaemon
a56ffff51b Update to wait and wait_timeout with a maximum of 10 minutes timeout 2015-12-07 20:27:31 +10:00
Brian Coca
15dcabe012 Merge pull request #2541 from joshuaeke/patch-1
Update ec2.py remove state tag
2015-12-05 10:12:55 -05:00
Arthur Clement
bfcdb05597 Example of single instance with ssd gp2 root volume creation 2015-12-03 22:48:13 +01:00
Brian Coca
43d2ecda06 Merge pull request #2546 from traveloka/fix-ec2-snapshot-info
Fix ec2_snapshot documentation
2015-12-01 09:46:48 -08:00
Toshio Kuratomi
cd9a7667aa Don't raise or catch StandardError in amazon modules 2015-11-30 19:02:28 -08:00
Mike Buzzetti
b00e1b556c Add evaluate taget health for alias based records 2015-11-30 17:50:40 -05:00
Brian Coca
ead1028256 Merge pull request #2565 from suonto/devel
Removed unneccessary permission greed
2015-11-30 09:22:54 -08:00
Brian Coca
aad7497f18 Merge pull request #2542 from maxrothman/patch-1
Fix rds "promote" command never promoting
2015-11-27 13:28:23 -08:00
luto
794911c592 vsphere_guest: support putting a guest into a nested folder 2015-11-27 20:04:20 +01:00
Markus Suonto
32edc2f56f fixed quantum_ modules to work with minimum access rights if greater access rights are not needed 2015-11-26 15:34:47 +02:00
Brian Coca
9c30ef8926 doc updates
- added version_added to new api_token
- updated notes to explain API issues, option switch and versions affected.
2015-11-25 23:48:02 -08:00
Etherdaemon
185a371efb Proposing a wait_for function to ensure elb has been successfully removed 2015-11-26 16:58:51 +10:00
Jay Rogers
cab97cd2d9 Update in Amazon IAM Policy Documentation
There were typos in the documentation that made the examples seem misleading of what was being demonstrated. This update fixes that.
2015-11-25 18:46:17 -06:00
Brian Coca
c428483b24 updated docs to denote retirement of v1 api and clarify when and why auth fields have changed 2015-11-26 09:41:33 -08:00
luto
7f01600813 vsphere_guest: when creating a guest, gather facts about it *before* disconnect 2015-11-25 17:14:19 +01:00
Lippy Lee
b2ace272a5 Make digital_ocean_domain use API v2 2015-11-25 22:10:31 +08:00
Michel Alexandre Salim
b07ff99cac Fix ec2_snapshot documentation
last_snapshot_min_age is added in 2.0, not 1.9
2015-11-25 15:08:48 +07:00
Max Rothman
f1f201c234 Fix rds "promote" command never promoting
Previously, the `promote` command in the `rds` module would always return OK and never actually promote an instance. This was because `promote_db_instance()` had its conditions backwards: if the instance had the `replication_source` attribute indicating that it **was** a replica, it would set `changed = False` and do nothing. If the instance **wasn't** a replica, it would attempt to run `boto.rds.promote_read_replica()`, which would always fail.
2015-11-24 16:10:28 -05:00
krdlab
dd76b51990 Fix self.changed value in ElbManager (ec2_elb_lb) 2015-11-25 04:42:51 +09:00
joshuaeke
ab420300ef Update ec2.py remove state tag
'exact_count' and 'state' are mutually exclusive options they should not be in the following examples:
- # Enforce that 5 running instances named "database" with a "dbtype" of "postgres" example and 
- # Enforce that 5 instances with a tag "foo" are running
2015-11-24 18:48:59 +00:00
Toshio Kuratomi
8ae30f1822 Minor simplification of code 2015-11-23 16:23:41 -08:00
Toshio Kuratomi
5617cd57cf Merge pull request #2512 from erewh0n/ec2-require-all-groups
Fail ec2 module when group names cannot resolve to IDs
2015-11-23 16:20:31 -08:00
Toshio Kuratomi
1270bacee7 Merge pull request #2425 from aioue/patch-5
Update ec2_elb_lb.py
2015-11-23 15:55:51 -08:00
Matt Martz
03035d7a31 Merge pull request #2524 from Shrews/os_image
Bug fix for os_image and min_disk/min_ram
2015-11-23 16:45:11 -06:00
Brian Coca
6bd8020f65 corrected version_added, removed empty alias 2015-11-24 09:32:46 -08:00
Brian Coca
b789db7b9d Merge pull request #2211 from kai11/feature/spot_launch_group
Added launch group support for ec2 module
2015-11-23 09:31:33 -08:00
David Shrewsbury
d13741314e Bug fix for os_image and min_disk/min_ram
The min_disk and min_ram parameters were not being passed to
the shade API. They also need to be integer values. Also
updated the description of these parameters for better
clarification.
2015-11-23 11:29:00 -05:00
Will Rouesnel
7237798f20 docker: Fix state=reloaded to detect default LoggingDriver for docker
Previously the logging module hard coded the default logging driver. This means
if the docker daemon is started with a different logging driver, the ansible
module would continually restart it when run.

This fix adds a call to docker.Client.info(), which is inspected if a logging
driver is not supplied in the playbook, and the container only restarted if
the logging driver applied differs from the configured default.

In usage, this has solved issues with using alternative logging drivers.
2015-11-24 00:30:42 +11:00
Keith Hassen
39ef6a1a80 Fail if any group name is not resolved to an ID. 2015-11-22 22:07:47 -05:00
Brian Coca
0e043f8c58 Merge pull request #2505 from donckers/devel
Fix #822 - Correct failure to overwrite existing records
2015-11-20 17:22:22 -08:00
Brian Coca
6d722608d6 Merge pull request #2413 from raben2/devel
Absent Function was not working on user with login profile
2015-11-20 17:00:20 -08:00
Daniel Donckers
3b8147af30 Fixes #822 2015-11-20 14:55:39 -06:00
Brian Coca
88e0bfd75d Merge pull request #2492 from Shrews/os_user_group
Fix os_user_group module
2015-11-18 12:55:40 -08:00
Mike Riddle
062c7764e6 Fixed error message: TypeError: fail_json() takes exactly 1 argument (2 given) 2015-11-18 15:10:15 -05:00
Brian Coca
1d6b31a90f fixed break order 2015-11-19 09:28:40 -08:00
David Shrewsbury
2a306c6b8c Fix os_user_group module
This module had a couple of errors in it. Also added check mode
support.
2015-11-18 15:03:07 -05:00
Tom Paine
4bc834485a Update ec2_elb_lb.py 2015-11-18 19:45:32 +00:00
Brian Coca
2c92fc4d3c Merge pull request #2484 from bcoca/ec2_elb_get_really_all
Ec2 elb get really all items
2015-11-17 12:20:51 -08:00
Chrrrles Paul
b1c0249045 Merge pull request #2409 from stewrutledge/reconfnetwork
Added support for reconfiguring network
2015-11-17 09:51:14 +08:00
Brian Coca
1258f82648 Merge pull request #2467 from cinek810/fix_ident
It may be string with int comparison, if ansible user specifies ident…
2015-11-13 14:57:21 -08:00
Marcin Stolarek
b6223ca729 Save changes of special characters to rset, without that comparison rset.to_xml() == wanted_rset.to_xml() will fail if record contains * or @ characters. 2015-11-13 11:32:10 +01:00
Marcin Stolarek
3193961cf5 It may be string with int comparison, if ansible user specifies identifier as int 2015-11-13 10:45:27 +01:00
Steve Spencer
fc5da26dee Sync up with allowable docker volume mounting modes 2015-11-12 10:42:26 +02:00
J Levitt
889274a525 Add rds restore example to list of examples
There was no db restore example. I've provided one that shows how to do the restore, then add a security group (you cannot add the security group during the restore step -- it has to be done in a modify step afterward). Also, I show how to get the endpoint.
2015-11-11 15:15:30 -06:00
Steve Spencer
2c95641d66 Add support for mounting host volumes with Z and z options 2015-11-11 16:44:01 +02:00
Rabenstein
7d665db5e5 Squash of 3 commits for bugfix.
Absent unction was not working on user with login profile
also fixed the exception handling

fixed the delete user function
now works with or without loginprofile (password)

typo
2015-11-11 09:54:55 +01:00
Monty Taylor
ccb39767cf Use add_ips_to_server API
This module is still using an old pre-release API and needs to update
to use the current API.

Co-Authored-By: Marton Kiss <marton.kiss@gmail.com>
2015-11-09 11:38:04 -05:00
Andy Nelson
9618986804 Update to ec2_vpc.py to:
1 allow interface ids and vpc peering connections as route targets
2 set state to "terminated" when VPC is removed
3 fix some comment typos

updates per PR comments
2015-11-08 18:35:27 +00:00
Toshio Kuratomi
f2943bd404 Add zfil as an owner of the docker module 2015-11-06 21:18:46 -08:00
Toshio Kuratomi
4ed7b690f6 Add a new contributor as a maintainer of the docker module 2015-11-06 10:53:33 -08:00
Toshio Kuratomi
750aa16a06 Merge pull request #2093 from zfil/fix_facts
docker module: fix regressions introduced by f38186c and 80aca4b
2015-11-06 10:20:20 -08:00
Tom Paine
dd26c37f6b Update ec2_elb_lb.py
add connection draining default
2015-11-06 17:43:24 +00:00
Will Thames
0dd58e9326 Use connect_to_aws where possible
`connect_to_aws` fixes a bug with security tokens in AWS.
Modules should use that rather than calling
`boto.x.connect_to_region`
2015-11-06 19:05:01 +10:00
Brian Coca
1f9c204178 Merge pull request #2379 from larsks/feature/os_server_facts_returns_list
os_server_facts returns facts about multiple servers
2015-11-05 12:50:29 -05:00
Stewart Rutledge
adbc430984 Added support for reconfiguring network (moving to another switch, for example) 2015-11-04 14:22:08 +01:00
Leonty
cff83dd257 Merge remote-tracking branch 'upstream/devel' into devel 2015-11-04 12:48:14 +03:00
Leonty
5b904c1401 Corrected misspelling in the 'labels' docker parameter documentation. 2015-11-04 12:43:03 +03:00
Toshio Kuratomi
62672b8b85 Merge pull request #2228 from abridgett/feature/add_ec2_elb_lb_idle_timeout
add idle_timeout support
2015-11-03 10:24:58 -08:00
Brian Coca
cac69f3135 added missing version_added 2015-11-03 13:25:46 -05:00
Brian Coca
aa6f80669a Merge pull request #534 from ferrants/ami-launch-permissions
ec2_ami can update an ami's launch_permissions
2015-11-03 13:21:44 -05:00
Brian Coca
c91da5714e Merge pull request #2279 from wimnat/feature/iam_policy_idempotentcy
Allow iam_policy to maintain idempotence if the role referenced has …
2015-11-03 13:10:42 -05:00
Brian Coca
3aee4b9469 Merge pull request #2326 from jibsheet/devel
Mark this as a string so it is rendered in the docs
2015-11-03 13:10:15 -05:00
Toshio Kuratomi
0de2627efc Make cache_parameter_group the name of this new param to match with similar params (leave old name as an alias) 2015-11-02 17:33:04 -08:00
Toshio Kuratomi
e16c5c54fd Revert "Expose cache_parameter_group_name in elasticache module"
This PR #1950 implements duplicate functionality to #1353
This reverts commit b04efa22c4.

Conflicts:
	cloud/amazon/elasticache.py
2015-11-02 17:27:54 -08:00
Brian Coca
59b87836d1 Merge pull request #2222 from pgilad/patch-1
Add state=running on some ec2 examples
2015-11-02 19:12:25 -05:00
Brian Coca
d6c97bc880 Merge pull request #2381 from gregdek/devel
Module ownership changes
2015-11-02 19:00:21 -05:00
Brian Coca
a38e0095f9 added missing version added 2015-11-02 18:54:30 -05:00
Brian Coca
6e905f0586 Merge pull request #1950 from frenchfrywpepper/cache_parameter_group_name
Expose cache_parameter_group_name in elasticache module
2015-11-02 18:49:55 -05:00
Toshio Kuratomi
e318be30ff Fix issues version_added and chaged => changed typo 2015-11-02 10:49:24 -08:00
Michael Schuett
80c2e28a48 Fix message
Previous fix did not actual work. This fix does however.
2015-11-02 10:49:24 -08:00
Michael Schuett
b0357bf9e8 Handle connection error
Try and help when mac hits a connection error.
2015-11-02 10:49:24 -08:00
Michael Schuett
1dcb31cad6 remove .geturl()
Can't call geturl on a string.
2015-11-02 10:49:24 -08:00
Michael Schuett
c126498899 Remove faulty logic
Update logic after splitting the error into two separate messages.
2015-11-02 10:49:24 -08:00
Michael Schuett
1e8d20b0da Documentation Fix
Updated documentation to match current module state.
2015-11-02 10:49:24 -08:00
Michael Schuett
0a5b7087bd Improve Message
Give user a course of action in the case where the suggestions do not
work. This will hopefully allow us to work through any further issues
much faster.
2015-11-02 10:49:24 -08:00
Michael Schuett
addbc329be Improve Error Reporting
This will hopefully help mac users be able to quickly resolve any issues
they may find when trying to use this module.
2015-11-02 10:49:24 -08:00
Michael Schuett
bf5929d32a docker_image TLS
Check commit enables using tls when using the docker_image module. It
also removes the default for docker_url which doesn't allow us to check
for DOCKER_HOST which is a more sane default. This allows you to use
docker_image on OSX but more documentation is needed.
2015-11-02 10:49:24 -08:00
Brian Coca
794cbeea23 use marker instead of is_truncated which does not seem to work 2015-11-02 13:10:20 -05:00
Brian Coca
b90318ae6c loop to get all load balancers, boto limited to 400 at a time
fixes #2115
2015-11-02 13:05:22 -05:00
luto
d5ed8381b6 vsphere_guest: add power status to facts 2015-11-02 17:48:37 +01:00
Brian Coca
77ded03510 Merge pull request #953 from rwky/asg_542
Fixes #542 error when ec2_asg arguments aren't specified
2015-11-02 09:04:42 -05:00
Adrian Bridgett
d4319555a0 Merge branch 'devel' into feature/add_ec2_elb_lb_idle_timeout
* devel: (84 commits)
  Document and return an error if httplib2 >= 0.7 is not present.  We
  since find doesn't make changes, support check mode and gather data for other tasks in check mode
  Correct typo in yum module docs
  Update doc to reflect password is required if adding a new user
  Update error message to be more explicit
  Simplify logic to handle options set to empty string
  Fix to issue 12912. Supply 'force' to install of python-apt.
  Note the difference between yum package groups and environment groups.
  rearranged systemd check, removed redundant systemctl check fixed unused cmd and state var assignements
  added earlier paths to systemd
  make os_router return a top level 'id' key
  Version bump for new beta 2.0.0-0.4.beta2
  allow os_port to accept a list of security groups
  allow os_server to accept a list of security groups
  Add capability for stat module to use more hash algorithms
  allow empty description attribute for os_security_group
  Update hostname.py
  simpler way to check if systemd is the init system
  make os_keypair return a top level 'id' key
  make os_flavor return a top-level 'id' key
  ...
2015-10-29 14:18:34 +00:00
Greg DeKoenigsberg
344cf5fc0e Remove @ralph-tice from maintainership per his request 2015-10-28 14:47:03 -04:00
Greg DeKoenigsberg
7cb9289197 Clarity of owner, even though module is deprecated 2015-10-28 14:40:54 -04:00
Greg DeKoenigsberg
57dcf2c9dd @lorin stepping down as maintainer 2015-10-28 14:38:11 -04:00
Lars Kellogg-Stedman
e70002d2f9 os_server_facts returns facts about multiple servers
have `os_server_facts` call `list_servers` rather than `get_server`, and
treat the `server` parameter as a wildcard pattern.  This permits one to
get facts on a single server:

    - os_server:
        server: webserver1

On mutiple servers:

    - os_server:
        server: webserver*

Or on all servers:

    - os_server:

Introduces a `detailed` parameter to request additional server details
at the cost of additional API calls.
2015-10-28 13:18:54 -04:00
Manuel Tiago Pereira
3079c5e001 Add support for legacy registries to pull_image().
Since we now have several exceptions to the assumption that the
result of the pull would be on the last status line returned by
docker-py's pull(), I've changed the function so that it looks
through the status lines and returns what if finds on it.
Despite the repeated `break`s, the code seems simpler and a little
more coherent like this. From what I've checked using
`https://github.com/jlafon/ansible-profile`, the execution time is
mostly the same.
2015-10-28 11:35:14 +00:00
Brian Coca
3b5afc2393 made port default depending on db engine 2015-10-27 21:49:54 -04:00
Brian Coca
30951e2811 Merge pull request #2345 from larsks/bug/port-allow-secgroup-list
allow os_port to accept a list of security groups
2015-10-26 19:45:39 -04:00
Brian Coca
7c1fcd8e13 Merge pull request #2349 from larsks/bug/router-should-return-id
make os_router return a top level 'id' key
2015-10-26 18:20:26 -04:00
Bermudez, Jaime
6992d0d465 Merge remote-tracking branch 'upstream/devel' into feature/iam_policy_present_state_includes_policy_changes 2015-10-25 08:37:40 -04:00
Brian Coca
ad8fd86467 Merge pull request #2338 from larsks/bug/flavor-should-return-id
make os_flavor return a top-level 'id' key
2015-10-23 14:52:03 -04:00
Brian Coca
0e0c28bfb1 Merge pull request #2344 from larsks/bug/allow-secgroup-list
allow os_server to accept a list of security groups
2015-10-23 14:51:45 -04:00
Brian Coca
3199a73927 Merge pull request #2339 from larsks/bug/keypair-should-return-id
make os_keypair return a top level 'id' key
2015-10-23 14:51:27 -04:00
Brian Coca
59f11aa973 Merge pull request #2336 from larsks/feature/os-subnet-returns-something
return information about created subnet
2015-10-23 14:51:05 -04:00
Lars Kellogg-Stedman
d82460a372 make os_router return a top level 'id' key
make os_router return a top-level 'id' key, much like other
os_* resources.
2015-10-23 13:32:37 -04:00
Lars Kellogg-Stedman
a2fe8dba68 allow os_port to accept a list of security groups
with this commit, the `security_groups` attribute for `os_port` will
accept either a common-delimited string or ` YAML list.  That is, either
this:

    - os_port:
        [...]
        security_groups: group1,group2

Or this:

    - os_port:
        [...]
        security_groups:
          - group1
          - group2
2015-10-23 09:44:07 -04:00
Brian Coca
12b0582f9e Merge pull request #2343 from larsks/bug/secgroup-allow-empty-description
allow empty description attribute for os_security_group
2015-10-23 09:43:01 -04:00
Brian Coca
49a66eb8d2 Merge pull request #2337 from larsks/bug/os-network-always-unchanged
make os_network correctly report changed status
2015-10-23 09:42:45 -04:00
Lars Kellogg-Stedman
b0c10a7d31 allow os_server to accept a list of security groups
This commit allows the `security_groups` parameter of the `os_server`
module to be either a YAML list or a common-delimited string (much like
the `nics` attribute).  E.g., this:

    - os_nova_server:
        [...]
        security_groups:
          - default
          - webserver

Or this:

    - os_nova_server:
        [...]
        security_groups: default,webserver
2015-10-22 22:53:05 -04:00
Lars Kellogg-Stedman
da0fbfc564 allow empty description attribute for os_security_group
The `os_security_group` module would fail if there was no `description:`
attribute:

    localhost | FAILED! => {
        "changed": false,
        "failed": true,
	"msg": "Error creating security group larstest: Invalid input for
	description. Reason: 'None' is not a valid string."
    }

This commit makes the default description `''` rather than `None`.
2015-10-22 21:26:47 -04:00
Brian Coca
1ca4543e48 Merge pull request #2315 from Etherdaemon/fix_aws_iam_connection_12831
fixes #12831 by updating the boto iam connection method
2015-10-22 16:17:57 -04:00
Bermudez, Jaime
d5f48d29e1 Simplify logic around "present" state and skip dupes. If the policy doesn't exist or the policy document doesn't match or if we're not skipping dupes, then we go ahead and update the respective user/group/role policy. 2015-10-22 14:54:28 -04:00
Lars Kellogg-Stedman
377811dac2 make os_keypair return a top level 'id' key
make os_keypair return a top-level 'id' key, much like other os_*
resources.
2015-10-22 13:59:45 -04:00
Lars Kellogg-Stedman
8368da4297 make os_flavor return a top-level 'id' key
make os_flavor return a top-level 'id' key, much like other os_*
resources.
2015-10-22 13:56:56 -04:00
Lars Kellogg-Stedman
c54c5c8234 make os_network correctly report changed status
The `os_network` module was incorrectly returning changed=False whether
or not the network was created.  This commit makes the changed return
value useful.
2015-10-22 13:38:32 -04:00
Lars Kellogg-Stedman
d73f5a4adb return information about created subnet
make os_subnet behave like os_network in terms of returning information
about the created resource.  With this commit, os_subnet will return the
created subnet in `subnet` and the subnet id in `id`.
2015-10-22 13:27:17 -04:00
David Shrewsbury
5d73a9a4c5 Fix for routers without external interfaces 2015-10-22 11:52:28 -04:00
Matt Martz
2e49d89be7 Merge pull request #2328 from emonty/bug/is-public
Actually pass in is_public to create_image
2015-10-21 19:46:18 -05:00
Monty Taylor
e7bdf7f7f6 Actually pass in is_public to create_image
Fixes #2325
2015-10-22 08:52:05 +09:00
Brian Coca
88e7dcf174 fixed mispelled description 2015-10-21 19:39:17 -04:00
Etherdaemon
08559670e5 Update try statement as pointed out by defionscode 2015-10-22 09:12:58 +10:00
Etherdaemon
d6da9c1516 Merge branch 'devel' into fix_aws_iam_connection_12831 2015-10-22 09:09:30 +10:00
Kevin Falcone
735eefb2ca Mark this as a string so it is rendered in the docs
When this was treated as a boolean, sphinx was leaving the Default
column on http://docs.ansible.com/ansible/ec2_module.html blank,
implying it would use AWS's default.  In reality, it passes False, which
overrides the defaults at AWS (it's possible to boot an instance which
AWS claims will always have EBS optimization without it because of this
silently passed False).
2015-10-21 16:43:50 -04:00
Toshio Kuratomi
bc3b1abd68 Another fix for docs 2015-10-21 08:40:10 -07:00
Toshio Kuratomi
e41cde3116 Correct docs build 2015-10-21 08:36:08 -07:00
Matt Martz
dc1f0c6f9f Merge pull request #2319 from Shrews/os_user
Add OpenStack Keystone User module
2015-10-20 15:43:50 -05:00
David Shrewsbury
fde149cbe8 Clarify password requirement and add return docs. 2015-10-20 15:49:52 -04:00
David Shrewsbury
cdf7117f7e Add OpenStack Keystone User module
This is a replacement for PR #1598 and fixes #283
2015-10-20 13:29:41 -04:00
Brian Coca
377aaf526c Merge pull request #2292 from Constantin07/update_ec2_ami_find
Included 'block_device_mapping' in the output of module and other mis…
2015-10-20 13:07:00 -04:00
Constantin Bugneac
01b8432496 Added documentation for returned structure 2015-10-20 09:30:57 +01:00
Etherdaemon
2b2285eb67 fixes #12831 by updating the boto iam connection method to connect_to_region 2015-10-20 16:38:27 +10:00
Brian Coca
14f32de7a6 added missing version_added to new accesslogs feature 2015-10-19 20:11:54 -04:00
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