Commit graph

7405 commits

Author SHA1 Message Date
Brian Coca
fdd88863d4 fixed bug in spec 2015-10-19 20:44:44 -04:00
Brian Coca
bc4b40d8e7 added regex support to find, also added 'singular' aliasess to patterns and paths 2015-10-19 20:44:44 -04:00
Brian Coca
14f32de7a6 added missing version_added to new accesslogs feature 2015-10-19 20:11:54 -04:00
Brian Coca
ccbcff8c8e better handling of checkmode for solaris
fixes #2296
2015-10-19 20:09:21 -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
68cb148433 Merge pull request #2286 from larsks/feature/tests
add some basic unit tests for cloud/openstack/os_server
2015-10-19 16:40:11 -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
Toshio Kuratomi
49ee5dd443 Remove debugging 2015-10-19 10:20:42 -07:00
Toshio Kuratomi
11833906b5 xmlcharrefreplace is only for encoding, not for decoding :-( 2015-10-19 10:15:13 -07: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
Brian Coca
b0b4c56bd7 made output match multiline, as per posted code from @n0trax
fixes #2081
2015-10-19 10:27:52 -04:00
Brian Coca
f33fba84c0 specified that uri must be uppercase 2015-10-19 10:14:07 -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
Matt Martz
77646818ae Merge pull request #2302 from emonty/bug/auto-ip
Make the auto ip parameter auto_ip
2015-10-18 19:39:02 -05: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
Lars Kellogg-Stedman
3387526bca add some unit tests for the os_server module
This commit adds some unit tests for the `cloud.openstack.os_server`
module.  These tests exercise `_network_args` thoroughly and
`_create_server` lightly.

These tests will **fail** until #2275 lands.

To run the tests:

    pip install -r test-requirements.txt
    PYTHONPATH=$PWD py.test
2015-10-16 21:03:50 -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
5893eb51a5 documented new remote_src option 2015-10-16 01:10:04 -04: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
Brian Coca
cfc3710a25 Merge pull request #2288 from pgilad/patch-2
Docs: remove redundant quotes in ec2_elb docs
2015-10-15 18:19:14 -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
Evan Carter
7b9c326ca6 add documentation stating that JSON files can be loaded with include_vars 2015-10-15 15:06:32 -04: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
4908d4a019 Merge pull request #2235 from tdbabas/devel
Fixing issue with subversion module whereby the module was reporting local modifications being present when externals were being used
2015-10-15 10:25:54 -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
Chris Church
84b1a1a2b7 Merge pull request #2083 from cchurch/win_lineinfile_fixes
Fix win_lineinfile to pass integration tests
2015-10-14 10:19:10 -04:00
Toshio Kuratomi
4c722dd99a Merge pull request #2268 from AdamWill/pull-18-stream
fix #2043: strip empty dict from end of 'pull' stream
2015-10-14 07:15:14 -07: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
Brian Coca
95b10c9fdd Merge pull request #2256 from jhawkesworth/fix_amc_2147
Fix for ansible-modules-core 2147
2015-10-13 20:17:28 -04: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
=
833bf77be1 Fix for ansible modules core 2147 2015-10-13 06:15:25 +01:00
Brian Coca
657363e011 Merge pull request #2252 from perzizzle/windows_ansible_date_time
Add ansible_date_time to windows facts
2015-10-12 18:48:59 -04: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