Commit graph

2209 commits

Author SHA1 Message Date
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
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
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
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
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
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
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