Commit graph

2173 commits

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