Commit graph

15413 commits

Author SHA1 Message Date
Helge Sychla
f09df1820b Change OS to VyOS in vyos_facts module's short description. (#22120)
modified:   lib/ansible/modules/network/vyos/vyos_facts.py
2017-03-01 10:26:10 +00:00
Matt Davis
76c46e9039 initial commit of win_domain_controller (#22115) 2017-02-28 19:04:52 -08:00
amblina
c6849a3464 S3 object parameter and bucket deletion exclusive (#21830)
Fixes ansible#21796 Prevent users from deleting buckets rather than objects by making object parameter and mode=delobj mutually exclusive in task.
https://github.com/ansible/ansible/issues/21796
2017-02-28 15:36:55 -05:00
Chris Houseknecht
2c0ad28056 Remove platform var from container_enabled meta (#22096) 2017-02-28 15:13:59 -05:00
Gaurav Rastogi
6df5f89763 Added check for avi SDK version as suggested in review. (#21927)
* Added check for avi SDK version as suggested in review.

* Fixed documentation based on review.

* Renamed module_utils.avi to module_utils.avi_ansible_utils
as import of avi.sdk would fail due to name collisions.

Moved the code to check for AVI version into the ansible modules.

* Updated the module with note about reason for name change.
2017-02-28 19:21:20 +00:00
Sorin Sbarnea
2f2e792cae Added support for ANSIBLE_VERBOSITY environment variable
Fixes 22087

Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
2017-02-28 10:50:22 -08:00
Brian Coca
e0975602d1 dont merge extra vars data if none
fixes #21889
2017-02-28 10:44:34 -05:00
Brian Coca
bfb3467d52 more set/list stuff 2017-02-28 10:44:20 -05:00
Chenjun Shen
4ba131d442 Add quota for the number of floating IP's to allow in Network. (#21471)
* Add quota for the number of floating IP's to allow in Network.

* Add nova_floating_ips and neutron_floating_ips aliases to avoid confusion.

* rename aliases to compute_floating_ips and network_floating_ips.
2017-02-28 14:47:57 +01:00
kulawczukmarcin
30bee433c3 Extend os image container and disk formats (#21275)
* Support docker as an os_image container format

As says openstack documentation
http://docs.openstack.org/developer/glance/formats.html
docker can be a container format for glance image.

* Support vhdx and ploop as an os_image container formats

As stands in  openstack documentation
http://docs.openstack.org/developer/glance/formats.html
those are supported disk formats for glance image.
2017-02-28 14:01:52 +01:00
jhawkesworth
99c594e573 win_iis_webapppool module, fixes and improvement (#20680)
* fixes and improvments for win_iis_webapppool module

* fixes following review feedback on win_iis_webapppool

* Fixed a too-long line in win_iis_webapppool documentation.

* Fixed trailing whitespace for pep8 compliance in documentation win_iis_webapppool.py

* fixed bracket bug

* module parameter attributes now populated.  Switched to hashtable for result object.  Removed remaining ; statement terminators.

* Remove example that was causing CI check failure
2017-02-28 11:14:41 +00:00
Matt Davis
a404745a31 initial commit of win_domain_membership module (#22027) 2017-02-27 17:37:38 -08:00
Peter Sprygada
3c401f9ba2 add common arguments to eos_banner (#22024)
fixes #22015
2017-02-27 20:22:42 -05:00
Brian Coca
d0e1a1c6c3 more compact metadata 2017-02-27 19:42:35 -05:00
Matt Davis
ae87bb632b initial commit of win_dns_client module (#22016) 2017-02-27 15:48:32 -08:00
Brian Coca
e3107cdeb6 removed unused imports and var 2017-02-27 18:39:21 -05:00
Matt Davis
8265860f07 suppress PS "unapproved verb" warning (#22018) 2017-02-27 14:29:43 -08:00
Benjamin Jolivot
a290f85eba Fix doc s/Slack/Mattermost/ (#22017) 2017-02-27 21:54:12 +00:00
Ryan Brown
1699c9ea48 [cloud] ec2_elb_facts fails on accounts with to many ELBs (#21602)
The list_elbs call to boto doesn't use any pagination, so any time there
are more ELBs than the API page size, this module will fail. This change
uses the `next_token` attribute of `ResultSet` to check if there are
still more ELBs to return.

Fixes #21361
2017-02-27 16:42:23 -05:00
Brian Coca
b3abab1bd5 Fact proccessing fixes (#22003)
* clarify facts assignment for several corner cases

run_once/delegate_facts:
 now delegate_facts > run_once, previously run_once always published facts to all hosts in play

include_vars/delegate_to:
  now include_vars allows to delegate to a specific host

also fix task_vars exception in delegate_facts/loop as var was removed

fixes #15365

* removed unused loop_var
2017-02-27 16:22:30 -05:00
Wittmer, Christian
52fbfa00f9 fix for #21729, use VERSION_ID instead of PRETTY_NAME to get release (#21730)
* fix for #21729, use VERSION_ID instead of PRETTY_NAME to get release
2017-02-27 15:01:02 -05:00
Will Thames
19d390135e Improve galaxy handling of tgz roles
Gerrithub presents tgz downloads that do not have a containing
directory. This causes a stack trace.

As all roles must contain a meta/main.yml, change ansible-galaxy
to use that to determine the enclosing directory (in the case
of multiple meta/main.yml files, use the one with the shortest parent)

Fixes #15413
2017-02-27 14:59:37 -05:00
Brian Coca
b3251c9585 Exceptit (#21864)
* more centralized exception handling

* only remove when verboxse
2017-02-27 13:29:40 -05:00
Toshio Kuratomi
89bf14e467 Change warning message as advised by bcoca 2017-02-27 09:41:41 -08:00
Nathaniel Case
6d9fb4d012 Network action plugin misusing display.debug (#21995)
* The correct answer was in fact display.vvvv
2017-02-27 12:34:31 -05:00
Brian Coca
6cb9f2bf65 corrected some errors/typos and missing import 2017-02-27 11:27:40 -05:00
cptchips
e16b907114 Update win_robocopy example (#21992)
"flags" is set, thus "recurse" and "purge" will be ignored.
2017-02-27 16:16:50 +00:00
Slezhuk Evgeniy
e12daee5eb jira: comply with current pep8 rule set 2017-02-27 11:13:23 -05:00
Will Thames
ebfc7bac94 cloudfront_facts module improvements
* Make more use of AWS Exception information
* Use pythonic dict assignments
* Improve documentation formatting to make option names clearer
  in descriptions
* Meet ansible line length requirements
* Tidy up flake8 messages
2017-02-27 10:22:55 -05:00
Will Thames
bd4003e3f2 Add tags to cloudfront distribution facts
Tags are available from cloudfront API, so make use of them
2017-02-27 10:22:55 -05:00
William L. Thomson Jr
b7229b0467 Adds latest to portage module (#21918) 2017-02-27 10:19:26 -05:00
Adrian Likins
ae1a610482 Rhsm pool not name 3898 (#21911)
* Subscibe to pools matched by id before name matches.

If the pools regex matches any pool ids, then subscribe only to those pools.
If there are no pool id matches, then attempt to match the regexp and pool names.
If there are pool name matches, subscribe to those pools.

Fixes #19466, https://github.com/ansible/ansible-modules-core/issues/3898 (partially)

* Add pool id/name matches to 'to keep' list

use subscribe() to use the pools-first logic on update
2017-02-27 10:04:44 -05:00
Paul Arthur
9c72d478ec hashi_vault: fix token logic
The token should not be set and checked twice, especially when the
second time overrides a previously set token.
2017-02-27 09:36:33 -05:00
Peter Sprygada
c1c54f1bf4 roll up of eos fixes (#21987)
* fixes to_command function in eos to not iterate over commands twice
* fixes lots of minor issues with _eos_template
2017-02-27 09:24:05 -05:00
Tim Rupp
888c8614fb Removes expanduser calls
The usage of type='path' includes the expanduser call itself. This
patch removes its duplicate usage. Related to #12263
2017-02-27 09:22:48 -05:00
Peter Sprygada
f95a11a9db fixes eos_eapi to error on wrong transport (#21993) 2017-02-27 09:20:08 -05:00
rollerwhrtn
e8ef826976 Changed datacenter Required to False since default is set. Fixes 'required and default are mutually exclusive for datacenter' error. Fixes 21076 (#21492) 2017-02-27 09:15:06 -05:00
Anhad Jai Singh
13dd4b108c Add 9p to list of special filesystems for selinux
When trying to copy files onto a Virtio-9p filesystem[1][2] int the host
using something like the template module, ansible throws an error that
says something like:

    invalid selinux context: [Errno 95] Operation not supported

Adding 9p to the list of exceptional filesystems forces ansible to not
try to set an SELinux context on copied files.

[1] such as one mounted in a qemu VM, using:

    # http://www.linux-kvm.org/page/9p_virtio
    qemu-kvm [...] -virtfs local,id=apps_dev,path=/host/dir,security_model=passthrough,mount_tag=host_dir

[2] https://www.kernel.org/doc/Documentation/filesystems/9p.txt

Change-Id: Ia868dadce1ffd2b5bebf5ee1804501676e9d7e5f
2017-02-27 09:13:28 -05:00
John R Barker
05d719a9f1 Empty init file (#21991) 2017-02-27 13:14:05 +00:00
John R Barker
7891859051 Create __init__.py 2017-02-27 13:00:36 +00:00
Slezhuk Yevgeniy
ea2b27f931 jira: (#21701)
- Add timeout param.
 - Some improvement on params description.
2017-02-27 11:56:58 +00:00
Dag Wieers
2cd6e56dc2 hponcfg: Configure HP iLO mgmt board (in-band) (#21677)
This is the original `hponcfg` module that was once accepted in
Ansible but had been removed subsequently because it could not be tested
by the Ansible project.

Since then it was moved to the ansible-provisioning project and
maintained by HP engineers going forward.

Now we are trying to get it upstreamed again.
2017-02-27 11:44:09 +00:00
Dag Wieers
a66d5dcc43 win_chocolatey: Add integration tests (#21930)
And also fix a known issue.
2017-02-27 11:36:52 +00:00
Peter Sprygada
ebc2716be7 removes old module.connected property from result (#21977) 2017-02-26 23:14:56 -05:00
Peter Sprygada
216877c6ca adds system_mtu argument to nxos_system (#21970)
* updates argument_spec
* adds unit test case
2017-02-26 11:33:58 -05:00
Peter Sprygada
4c354c9c70 adds integration tests cases for nxos_feature (#21966) 2017-02-26 08:12:57 -05:00
Peter Sprygada
10b23f3a00 adds unit test cases for nxos_command (#21959) 2017-02-26 07:38:08 -05:00
Peter Sprygada
0cb2019293 roll up of bug fixs for nxos_evpn_global (#21961)
* updates nxos_evpn_global module
* adds integration test cases
* adds unit test cases
2017-02-26 06:45:26 -05:00
René Moser
06acf8ac2e nginx_status_facts: fix pep8 (#21963)
* nginx_status_facts: fix pep8

* remove from legacy files
2017-02-26 11:25:09 +01:00
René Moser
cecf22039d cs_vpc: fix pep8 (#21964) 2017-02-26 10:21:12 +01:00
Nathaniel Case
9b9ed59d98 Vyos config fixes (#21862)
* Fix vyos signatures to match new versions

* Fix test cases referring to 'updates' instead of 'commands'

* I think this is an artifact of `connection: network_cli`?
2017-02-25 21:14:40 -05:00
Nathaniel Case
ca21d09483 Fix a few errors (#21854) 2017-02-25 21:12:49 -05:00
Peter Sprygada
a284c3f7ea roll up of fixes for nxos_facts (#21954)
* fixes commands to work with nxapi
* updates test case timeouts
2017-02-25 17:48:09 -05:00
Peter Sprygada
16a39639f5 fixes minor bugs in eos_eapi module (#21925)
* module will now check protocol running state before return
* warns on config argument no longer being needed
* lots of integration test cases updated
* updates unit and integration test cases for state check

fixes #21908
2017-02-25 17:18:46 -05:00
Peter Sprygada
1f9b503e89 fixes issue with config parents on eos modules (#21923)
eos_config module wasn't respecting config block path (parents).  This
patch fixes that problem.  Also fixes a number of integration tests
cases

fixes #21903
2017-02-25 16:40:13 -05:00
Peter Sprygada
14c05d9e2b roll up of fixes for nxos_config (#21949)
* fixes provider to not log entries
* fixes nxapi send_request with config statements
* fixes nxapi get_config()
* updates nxos_config integration tests
2017-02-25 16:36:00 -05:00
Peter Sprygada
f9b108e319 fixes issue that caused eapi transport setting to get lost (#21919)
The eos action didn't properly set provider transport argument for the
module.  This patch fixes that problem
2017-02-25 15:20:32 -05:00
Peter Sprygada
01ac1bc6e5 roll up of fixes from nxos integration tests (#21948)
* now fails nxos_nxapi if the transport=nxapi
* fixes typos in nxos_nxapi integration tests cases
2017-02-25 13:17:04 +00:00
René Moser
d26c57f938 exoscale: pep8 and python3 fixes (#21821)
* exoscale: pep8 fixes

* exo_dns_record: remove from pep8 test legacy

* exoscale: fix python3 support
2017-02-25 10:32:39 +01:00
Barry Peddycord III
2ca5719168 Deprecating old cumulus modules (#21726)
* deprecating old nclu modules

* adding deprecated cl_ moduels to changelog

* renaming deprecated modules
2017-02-25 08:01:04 +00:00
Dag Wieers
98934939af win_copy: Add force parameter and check-mode support (#20405)
* win_copy: Add force parameter and check-mode support

The rationale behind this is that if you're working with +3GB files,
creating the checksum takes a lot of time, which we can avoid by simply
testing if the file exists.

I also took the liberty to put the various parameters together. It
probably takes a (neglible) performance hit but makes the code a bit
easier to inspect/work with, as its closer to all other windows modules.

On a normal run, the action plugin does a local checksum of the source
and a remote checksum of the destination. And afterwards, the module
will do another remote checksum of the copied source, a remote checksum
of the original destination, and another remote checksum of the copied
destination.

On a very huge file (think 4GB) that means 5x reading the complete file
(if you have a large cache you may get away with it, otherwise you're
doomed !).

This patch will ensure with `force: no` that not checksums are being
performed.

* Moving presence check before remote checksum

* Adapted to wishes

* Even more performance improvements
2017-02-24 18:10:09 -08:00
Brian Coca
ce08b4165d ansible-doc more flexible to metadata changes 2017-02-24 20:58:37 -05:00
Matt Martz
305c88700d PEP8 E712 fixes (#21916) 2017-02-24 16:49:43 -06:00
Matt Clay
4e0f82e0e9 Fix PEP 8 issue. 2017-02-24 12:55:55 -08:00
John R Barker
1d2349872a RETURN block is broken, so delete it 2017-02-24 20:44:48 +00:00
Toshio Kuratomi
49db03c384 Fix for traceback when we encounter non-utf8 characters in diff
We can diff non-utf8 files (as part of copy, for instance) but when we
try to turn the bytes into text for display, the characters cause
a traceback.  Since diff output is only informational, we can replace
those problematic bytes with replacement characters.  We do not want to
do this to other fields because those fields may be used inside of the
playbook (for templating another variable or matching in a conditional).

Fixes #21803
Fixes #21804
2017-02-24 12:18:32 -08:00
Brian Coca
9ac697a155 simplified persistent connection quandry 2017-02-24 15:15:18 -05:00
Brian Coca
2a6145ca1c prep for role passthrough instead of detection
(cherry picked from commit 2125a23f2ab0903065a13f9ee68ae43ed348d6fb)
2017-02-24 15:15:18 -05:00
Peter Sprygada
c85d794d83 fix argument name in nxos shared lib (#21912)
fixes #21895
2017-02-24 13:23:31 -05:00
Adrian Likins
6c6b647182 Fix 'ansible-vault edit /some/symlink' (#20417)
Since vault edit attempts to unlink
edited files before creating a new file
with the same name and writing to it, if
the file was a symlink, the symlink would
be replaced with a regular file.

VaultEditor file ops now check if files
it is changing are symlinks and instead
works directly on the target, so that
os.rename() and shutils do the right thing.

Add unit tests cases for this case and
assorted VaultEditor test cases.

Fixes #20264
2017-02-24 12:35:39 -05:00
Adrian Likins
8830cde28d Fix 'task name is not templated in retry callback' (add task_name property to TaskResult) (#21214)
Fix 'task name is not templated in retry callback'

Add a task_name property to TaskResult that knows to
check in TaskResult._task_fields.

Add integration test for v2_retry_runner callback

Fixes #18236
2017-02-24 12:33:24 -05:00
Adrian Likins
78c4f03e50 Fix firewalld get_masquerade_enabled_permanent error (#21693)
get_masquerade_* functions only take one arg. The action_handler
wrapper function expected a tuple, but was being passed (zone)
instead of (zone,) making for an ambiquous tuple. The
(zone) arg was being treated as a tuple/list of six chars
(the zone name) instead of a tuple of one string.

This would cause errors like:

        get_masquerade_enabled_permanent() takes exactly 1 argument (6 given)

Fixes #21632
2017-02-24 12:32:28 -05:00
Ricardo Carrillo Cruz
e6a78b38d3 Remove check_args import (#21905)
It is defined in the file, thus no point in importing it.
2017-02-24 17:41:53 +01:00
Gaurav Rastogi
436095f576 New module for setting up Avi Pool (#21241)
* New module for setting up Avi Pool

* Fixed inconsistency between argspec and documentation regarding defaults and required attributes

* Added support for module_check
2017-02-24 16:38:16 +00:00
Gaurav Rastogi
055f2c29a5 New module to setup Avi VirtualService (#21170)
* Added new module to setup Avi VirtualService

* Fixed the documentation error where [] brackets where used making it incompatible with yaml

* Fixed inconsistency between argspec and documentation regarding defaults and required attributes

* Added support for check mode
2017-02-24 16:38:02 +00:00
Gaurav Rastogi
de841a6429 New module for setting up Avi SSL Key and Certificates for Virtual Se… (#21242)
* New module for setting up Avi SSL Key and Certificates for Virtual Services

* Fixed inconsistency between argspec and documentation regarding defaults and required attributes

* Added support for module_check
2017-02-24 16:37:51 +00:00
Gaurav Rastogi
39a93eb357 New module for setting up Avi Pool Group settings. (#21243)
* New module for setting up Avi Pool Group settings.

* Fixed inconsistency between argspec and documentation regarding defaults and required attributes

* Added support for module_check
2017-02-24 16:37:13 +00:00
Gaurav Rastogi
51718fd32b New module for setting up Avi Pool Health Monitors (#21240)
* New module for setting up Avi Pool Health Monitors

* Fixed inconsistency between argspec and documentation regarding defaults and required attributes

* Added support for module_check
2017-02-24 16:36:18 +00:00
Pavel Malyshev
7063db64c2 redhat_subcription module accepts id in the pool argument [#3898] 2017-02-24 10:38:46 -05:00
Dhivyap
e3dc202a3c Fixes #18663 Bad Handling of existing config in OS6 module (#21661)
Fix bad handling of existing config in OS6 module

Fixes #18663
2017-02-24 10:29:18 -05:00
Simon Li
ef7dd0cb2c Set os_server metadata on existing instances (#19318)
* Update metadata on existing openstack instances

This adds or updates existing keys, but doesn't remove them
Fixes #5500

* Set meta to {} if None

* Move common metadata parsing into a method
2017-02-24 12:46:03 +01:00
Dag Wieers
581bf7bb97 win_environment: Clean up, check-mode and diff support (#21356)
* win_environment: Clean up, check-mode and diff support

Changes include:

- Remove trailing semi-colons
- Replaced PSObjects into normal hashes
- Make use of Get-AnsibleParam and types
- Added check-mode support
- Added diff support

* Improve diff-support by using standard naming

I started to use the variable $diff_support for the boolean that takes
care of diff output support.
2017-02-24 10:34:05 +00:00
Dag Wieers
b1f6344ecb win_chocolatey: Clean up parameter handling (#21533)
Changes include:

- Use Get-AnsibleParam with -type/-validateset
- Replace $result PSObject with normal hash
- Deprecate 'upgrade' parameter by using state=latest
2017-02-24 10:09:11 +00:00
Dag Wieers
78c300412d win_user: Clean up parameter handling and $result hash (#21375)
* win_user: Clean up parameter handling and $result hash

Changes include:
- Use of Get-AnsibleParam and parameter types/validateset
- Removed parameter validation
- Replace $result PSObject with normal hash

* Revert to original formatting

* Parameter "groups" is a list
2017-02-24 10:08:15 +00:00
Matt Martz
36e6c7973d pep8 fixes for module_docs_fragments (#21876) 2017-02-24 09:01:03 +01:00
Dag Wieers
cfb1f72d1c Improve winrm import error message (#20267)
The requests python module is needed, however it is not a dependency of
the python-winrm package. The python-winrm package does require
python-requests_ntlm, which does not seem to pull python-requests.

So for the time being (until Red Hat fixes their package) give a more
informative error message.
2017-02-23 23:42:23 -08:00
Dag Wieers
70336c63c9 win_uri: Replace -type "string" with -type "str" (#21373)
Type "string" does not exist.
2017-02-23 23:35:52 -08:00
Dag Wieers
582557bc09 win_file_version: Clean up and check-mode support (#21379)
* win_file_version: Clean up parameter handling and $result hash

Changes include:
- Replacing $result PSObject with hash
- Use Gt-AnsibleParam using -type

* Revert to original formatting
2017-02-23 23:35:19 -08:00
Dag Wieers
69ac88176d win_group: Clean up and check-mode support (#21384)
* win_group: Clean up and check-mode support

Changes include:
- Use Get-AnsibleParam with -type/-validateset support
- Replace $result PSObject with normal hash
- Add check-mode support

* Revert to original formatting
2017-02-23 23:34:33 -08:00
Dag Wieers
928880c639 win_owner: Clean up and check-mode support (#21385)
* win_owner: Clean up and check-mode support

Changes include:
- Use Get-AnsibleParam with -type/-validateset
- Replace $result PSObject with normal hash
- Add check-mode support

* Implemented -WhatIf:$check_mode support

* Revert to original formatting
2017-02-23 23:33:35 -08:00
Dag Wieers
313a9d3845 win_share: Clean up parameter handling (#21386)
* win_share: Clean up parameter handling

Changes include:
- Use Get-AnsibleParam with -type/-validateset
- Replace $result PSObject with normal hash

* Revert to original formatting
2017-02-23 23:31:09 -08:00
Dag Wieers
cb78262c18 win_lineinfile: Clean up and check-mode support (#21503)
* win_lineinfile: Clean up and check-mode and diff support

Changes include:
- Use Get-AnsibleParam with -type support
- Replace $result PSObject with normal hash
- Remove trailing semi-colons
- Fix indentation (majority is tabs, few lines using spaces)
- Add check-mode support
- Support `r and `n for CR and LF
- Add diff support

* Implement -WhatIf:$check_mode support

* Keep original formatting as requested
2017-02-23 23:29:11 -08:00
Dag Wieers
d239adb5e5 Improve diff-support and use Add-Warning() (#21519)
I started to use the variable $diff_support for the boolean that takes
care of diff output support.
2017-02-23 23:22:39 -08:00
Dag Wieers
ff1efb2c1c win_nssm: Clean up parameter handling + docs (#21625) 2017-02-23 23:14:12 -08:00
Dag Wieers
58cbf1bfe0 Implemented -WhatIf:$check_mode support (#21628) 2017-02-23 23:10:25 -08:00
Dag Wieers
aebf6c8c92 powershell.ps1: Ensure Fail-Json() works with Hashtables (#21697)
Without this change a dictionary $result object would be emptied if it
is anything but a PSCustomObject. Now we also support Hashtables.
2017-02-23 23:08:19 -08:00
Dag Wieers
01afed4dc5 win_stat: Module cleanup (#20672)
* win_stat: Clean up and bugfixes

- Fix an issue where LastWriteTime was actually LastAccessTime
- Return lnk_source = $null for a broken link
- Remove a useless -Replace '\\','\\'
- Make use of new parameter options (-type and -aliases)

* Deprecate get_md5 with checksum_algorithm: md5

As suggested in comments we deprecate get_md5 and internally
replace it with `get_checksum` and `checksum_algorithm: md5`.

We show a warning to the user about this change.

Also remove empty warnings output. This simplifies modules code
(e.g. standard empty list is provided and snippets can add items).

* Adapted to use the new Add-DeprecationWarning() mechanism

* Revert to original formatting
2017-02-23 22:58:51 -08:00
Dag Wieers
f47901c3ad powershell.ps1: Add str, int, float types and ignore $null values (#21377)
* powershell.ps1: Add str type and ignore $null values

Changes include:
- New "str" type support using -type "str"
- Ensure that $null values are retained (for bool and str types)
  (Note: $null means unspecified value for parameters)
- Some minor cosmetic changes

* Also add -type "int" and -type "float"

No modules require this at the moment though.
2017-02-23 22:41:03 -08:00
Dag Wieers
371f9fa90d win_slurp: Small cleanup (#21363)
* win_slurp: Small cleanup

Included changes:
- Rewriting the parameter handling (aliases and type)
- Modified the $result hash for both Exit-Json and Fail-Json
- Changed the Test-Path statement

* Revert to original formatting
2017-02-23 22:38:17 -08:00
Dag Wieers
a64fb3eebf win_get_url: Clean up and check-mode support (#21381)
* win_get_url: Clean up and check-mode support

Changes include:
- Clean up parameter handling
- Replace $result PSObject with hash

* Revert to original formatting
2017-02-23 22:26:01 -08:00
Tim Rupp
b07aa990c9 Adding fixups based on abadger's comments
Using ABCs, and reducing code
2017-02-23 16:55:11 -08:00
Peter Sprygada
c3150fbfa9 fixes _nxos_template to use persistent connection (#21841)
The module needed full update to use the persistent connection
introduced in Ans2.3.

fixes #21835
2017-02-23 16:59:41 -05:00
Peter Sprygada
381f7209f8 fixes issue in nxos_config when retrieving current config (#21843)
When parsing the configuration, the wrong indent level was set so the
configurations could not be properly compared.  Also noted that
defaults: yes needed to be added to the integration tests to make the
test cases valid, which is also included in this patch

fixes #21828
2017-02-23 16:59:29 -05:00
Peter Sprygada
06d0278290 fix bug that would cause stack trace in nxos_nxapi (#21861)
The parse_sandbox function will generate a stack trace if the command
is not supported.  This patch will resolve that issue.
2017-02-23 16:59:06 -05:00
Sloane Hertel
942ed42eb0 [cloud] Support deadletter queue configuration in lambda module (#21720)
* Add dead_letter_arn option for Lambda.py

* fix logic so DeadLetterConfig can be deleted
2017-02-23 16:04:45 -05:00
Dave Buckley
776116e809 allow server facts to be retrieved by nova UUID (#20924)
* allow server facts to be retrieved by nova UUID

* update docs to state that a nova UUID can be passed to 'server'
2017-02-23 20:34:46 +01:00
philsch
a3099b2294 Document returned values of module pause
Adds missing documentation of the return values of
`pause`. Important to know how to retrieve user input.
2017-02-23 13:47:18 -05:00
Kenny Gillen
21e29080ba Fixed typo s/simple fail/simply fail (#21853) 2017-02-23 10:43:12 -08:00
molekuul
7734dd5890 Add the aix_inittab module to be able to modify the inittab at AIX systems (#21511)
* Added the aix_inittab module to be able to modify the inittab at AIX systems.

* fixed identation errors

* fixed identations and trailing whitespace
changed if conditions

* repaired tab-identation

* adjusted to long line and identation

* Adjusted the yaml in the example documentation

* Adjusted the documentation yaml

* Repaired return yaml

* repaired typo

* Removed unnecessary parameters from comment
changed action to state, and changed the way to call this module
changed proccessaction to action

* adjusted result['warnings'] to module.warn()

* adjusted the documentation

* changed warning to failed
ran module against autopep8

* added check_mode

* fixed typo

* changed description and short description, to be able to push again after a failure at shippable
2017-02-23 13:36:26 -05:00
Kevin Kirsche
466131198b Remove explicit port from pushover module (#19078)
Fixes #18868
2017-02-23 10:40:04 -06:00
Philipp Schmiedel
88f67747cc [cloud] Add force flag to ec2_key module (#21685)
Set the `force` flag to false to:
  - protect existing Keys from being overwritten
  - check if a Key was already existing by evaluating
    the returned `changed` status
2017-02-23 09:46:52 -05:00
Peter Sprygada
b25c51f99a cast http_port, https_port to int from config (#21840)
When retrieving the http_port, https_port values from the configuration
of the device, the values need to cast to int in order to correctly
compare against the argspec values.  This patch fixes that problem.

fixes #21832
2017-02-23 13:05:59 +00:00
Peter Sprygada
ab0f992b3a fixes import statement in nxos_facts module (#21834)
trying to import from the wrong shared lib, this patch changes
network_common to connection.  Also fixes a bug found in the nxos
action plugin to detect transport

fixes #21829
2017-02-23 13:00:34 +00:00
kuboj
551a765ea5 added ability to modify nova flavor metadata in os_nova_flavor module (#20091)
* added ability to modify nova flavor metadata

* documentation for os_nova_flavor module fixed
2017-02-23 12:58:13 +01:00
camradal
f7e426e636 os_auth: display proper error message for exceptions (#20891) 2017-02-23 12:04:43 +01:00
Colleen Murphy
352815ecbb Add domain_id parameter to openstack os_group (#20609)
Previously, the os_group module did not have any way to specify under
which domain a group should be created. This meant that a group could
only be created for the default domain. The keystone API supports the
domain_id parameter for group creation[1] as does the shade library[2]
so this patch adds the support in the ansible module.

[1] http://developer.openstack.org/api-ref/identity/v3/index.html?expanded=create-group-detail#create-group
[2] http://docs.openstack.org/infra/shade/usage.html#shade.OperatorCloud.create_group
2017-02-23 10:57:07 +01:00
Helge Sychla
b8d308d919 Revert syntax change of set_fact example for strings and booleans. (#21819)
The reverted change (Examples syntax batch7 (#5624), 99de7f0) makes the
example not match its description.

	modified:   lib/ansible/modules/utilities/logic/set_fact.py
2017-02-23 10:15:32 +01:00
Benjamin Jolivot
1e84c401f1 Fortios_config PR (#21409)
* Remove state & change backup strategy & fix doc fragment

* Missing __init__.py

* Move backup to module_utils + add backup_path & backup_filename params

* Fix pep8

* Change backup_path type from str to path

* Change license from gpl to bsd

* Fix doc and backup param leftover

* Fix Doc
2017-02-23 10:01:31 +01:00
Peter Sprygada
730bd682c6 sends save command in text mode otherwise it fails (#21812)
Sending the save command over nxapi requires text mode otherwise nxapi
will reject the command.  This commit ensures that the command is always
sent in text mode

fixes #18971
2017-02-22 22:41:14 -05:00
Peter Sprygada
0e7ebf6391 fixes issue with setting transport to nxapi (#21811)
The nxos action handler did not map the nxapi value to the provider
argument properly.  There as an additional fix in the nxos shared lib
to properly detect nxapi being set
2017-02-22 22:07:33 -05:00
Matt Clay
4554e8d769 Remove unnecessary shebangs and execute bits. 2017-02-22 18:13:46 -08:00
tomkitchen
9d2d364a38 #21440. Module Win_Regedit, pipe all calls to New-ItemProperty and Get-ItemProperty (when not stored as variable) to Out-Null (#21771) 2017-02-22 17:44:50 -08:00
Peter Sprygada
7b30203016 cleans up nxos_vlan output (#21807)
Only returns debug return keys when the debug flag is set
2017-02-22 20:36:43 -05:00
Peter Sprygada
0a62d7c1f4 adds missing argspec to eos_user module (#21806)
Updates the eos_user module with the common eos arg spec
2017-02-22 20:19:15 -05:00
Peter Sprygada
1ef0287854 casts the bridge id to a str prior to building command (#21805)
This will prevent exception from being raise when calling _vsctl and
extending the cmd with the bridge information
2017-02-22 19:31:36 -05:00
Damien
9634f1e9c9 Fix variable name to return to match latest pyez pos version (#21717) 2017-02-22 16:46:30 -05:00
Troy Ready
3f391f5a23 update ec2_ami_find to allow product-code filter (#18896)
CentOS's cloud image wiki page (wiki.centos.org/Cloud/AWS) gives an
example of using their product code to search for AMIs. This commit
adds an optional parameter to ec2_ami_find to allow this filtering.
2017-02-22 22:36:59 +01:00
jctanner
8c521655e1 Fix traceback on indexing empty list (#21784)
* Fix traceback on indexing empty list
* Make it more 'idiomatic'
* Forgot the index
2017-02-22 16:14:39 -05:00
Peter Sprygada
f8157d579a fixes error where a transport is not set for nxos (#21790)
Will now make sure transport is set to `cli`
2017-02-22 12:47:21 -05:00
Yuri Khan
a4ae0c85f1 Support 256-color terminals (#17750) 2017-02-22 12:37:26 -05:00
Peter Sprygada
8824387cf8 fixes ios_command to_command method (#21792)
Changes key from response to answer to match expected payload

fixes #21791
2017-02-22 17:20:18 +00:00
Peter Sprygada
58ee661437 fixes play context connection user (#21776)
Does't map remote_user back into vars if connection is local to preserve
the user variable.  This is done to be able to set connection_user
prop in play_context for the network_cli plugin connection
2017-02-22 15:34:11 +00:00
Brian Coca
93ac278f4c added 'extensions' options to include_vars
This allows users to override default 'extensions read' when using the dir option
2017-02-22 10:31:22 -05:00
Toshio Kuratomi
45251f910c Make BaseFileCache into an abstractbaseclass so it's a proper interface
Push the opening and closing of files into the _load and _dump methods
so that we don't invoke the slow codec machinery without reason.
2017-02-22 10:27:29 -05:00
Toshio Kuratomi
c033e5111f Graceful error message for abstract base classes in PluginLoader 2017-02-22 10:27:29 -05:00
Brian Coca
374af06cbf added pickle and yaml cache plugins
added new base class for file based cache plugins as 99% of code was common
now also catches unexpected decoding exceptions
allows per module file modes and encoding
moved jsonfile code to base
2017-02-22 10:27:29 -05:00
scottb
3812c76168 Update GUIDELINES.md
Edited for grammar and clarity.
2017-02-22 10:25:42 -05:00
Brian Coca
96d952a998 fix typo 2017-02-22 10:25:42 -05:00
Brian Coca
4bdaf6a4f0 updated guidelines to reflect boto3 preference 2017-02-22 10:25:42 -05:00
Dhivyap
75d7c70e70 Fixes#5534-Handled Command Prompt in exec mode (#21651)
* Fixes#5534-Handled Command Prompt in exec mode

* Pep8 Cleanup
2017-02-22 09:58:21 -05:00
Ricardo Carrillo Cruz
ab4e83f288 Remove superfluous include on iosxr filesystems fact gathering (#21775)
The regex will catch only lines that start with 'Directory of' regardless.
Also, fixing unit tests while at it.
2017-02-22 15:44:17 +01:00
Peter Sprygada
9e6980a039 fixs command dict to be sent to connection socket (#21713)
There as an invalid key in the command dict that would cause failure
using prompts.  This changes the key from response to answer which is
what is expected by network_cli
2017-02-22 09:44:04 -05:00
Adrian Likins
6e7b89764e Fix snmp_facts error on decode_hex() (#21694)
* Fix snmp_facts error on decode_hex()

Remove use of some_string.decode('hex') that fails on py3, and
replace with to_binascii.unhexlify()

Fixes #21668
2017-02-22 09:32:20 -05:00
Matt Martz
b143fdea54 DOC options must be a dict when used with extends_documentation_fragment (#21745)
* Fix string formatting
* Provide better tracebacks
* When options is None and extends_documentation_fragment is in use, add an error that options must be a dict
* If options was specified and not a dict, then error
2017-02-21 17:42:39 -08:00
James Cammarata
404b2864ef Additional lock down of conditionals 2017-02-21 17:49:08 -06:00
Brian Coca
5258e6d52a use safe load instead
fixes #21724
2017-02-21 17:45:46 -05:00
James Cooke
8ec28a2ba4 Download remote apt deb file in bytes mode in Python 2 and 3
Fixes #19710
2017-02-21 14:26:58 -08:00
James Cammarata
9f0b354023 Use proper YAML constructor class for safe loading 2017-02-21 16:23:42 -06:00
Toshio Kuratomi
2dde7f7768 Fix a case where we mixed text and bytes in the local connection plugin
Fixes #20710
2017-02-21 14:19:08 -08:00
Tim Rupp
6a4324ee99 [network] fix imported name in F5 module_utils (#21733)
Whoops. not called that.
2017-02-21 16:40:23 -05:00
Ryan Brown
c136ff58c0 [cloud][docs] Fix misleading Route53 value example (#21689)
The `route53` module uses a comma-separated string for records
containing more than one value. Fixes #21134
2017-02-21 15:48:32 -05:00
James Cammarata
3d65482927 Stash post-validated fields of the task in the TaskResult
This allows us to have a snapshot of the fields, which we can restore
on the pre-fork side so as to avoid having to re-template fields.
2017-02-21 14:35:13 -06:00
jctanner
40235d7b99 Skip fact gathering if the entire play was included via conditional and False (#21734)
Addresses #21528
2017-02-21 14:46:10 -05:00
Pierrick Caillon
a1b3664ec4 Fix: mysql_user - permission string with column privileges
MySQL returns privileges on columns as "PRIVILEGES (column)".
For permissions to be correctly matched, it must be specified exactly the
same in the module argument. A resulting string is like
"dbname.dbtable:PRIVILEGES (column)". Thus, the space before the opening
parenthesis must also be removed when creating the set of privileges for
validation.
2017-02-21 10:51:03 -08:00
Matt Clay
879feff6b7 Fix PEP 8 issue. 2017-02-21 10:24:02 -08:00
Veaceslav Mindru
cdcdc1d81b #19587 add yum skip-broken (#21475)
* #19587: refactor to PEP8

* Issue: #19587: add skip_broken option to yum module
PNTSYSOPS-1901 - internal reference

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>

* Issue: #19587: fix line break, attempt to make readble

        things at line 646 look ugly ..
        trying to make them look a bit more human readble
        though the entire approach should be rewriten

PNTSYSOPS-1901 - internal reference

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>

* #19587: fixing typo, skip-broken has to be passed as list

* PR: #21475: peer review changes
            relates to: revert comment deletion https://github.com/ansible/ansible/pull/21475#discussion_r101574146
            relates to: remove irelevant var https://github.com/ansible/ansible/pull/21475#discussion_r101573388
            relates to: reformat https://github.com/ansible/ansible/pull/21475#discussion_r101572840

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>

* PR: #21475: peer review changes
            relates to: https://github.com/ansible/ansible/pull/21475#discussion_r101573736

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>

* Issue: #21475: fixing typo in the Man section

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>

* PR: #21475 - Peer review: revert variable a
        Relates to: https://github.com/ansible/ansible/pull/21475#pullrequestreview-22404868

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>

* Issue: 19587 - small correction

Signed-off-by: Veaceslav Mindru <vmindru@redhat.com> <mindruv@gmail.com>
2017-02-21 07:59:07 -08:00
Adrian Likins
297566f2fd Wrap vault encrypt_strings zip() result in list for py3 (#21695)
py3 zip() results are not lists, so list'ify the result
for py2/py3 compat.
2017-02-21 10:30:21 -05:00
Damien
6fadddeaba network/aos - Fix doc for session information (#21718)
* Fix EXAMPLES to make session variable homogeneous across all modules

* Fix parameter name in EXAMPLE, template not design_template
2017-02-21 14:56:12 +00:00
Peter Sprygada
6e9244a9e1 adds more logging output to network_cli and ansible-connection (#21716) 2017-02-21 09:21:41 -05:00
Sebastien Lacoste-Seris
77596951b8 Update vca_vapp.py (#19562)
Check result of vApp creation and return module failure if creation task not present
2017-02-21 09:00:07 -05:00
Ricardo Carrillo Cruz
6622b05326 Fix memory ios facts (#21696)
In order to populate the total and free mem of an IOS device, we run
the 'show memory statistics' command.
The output shows something similar to:

                Head    Total(b)     Used(b)     Free(b)   Lowest(b)  Largest(b)
Processor    BEAE880   335215488    64044364   271171124   268918092   268463852
      I/O    8DAE880    51380224    41880736     9499488     9461552     9352252

We need to just parse the line containing 'Processor' and get the first and third
number for total and free mem, instaed for first and second as the code wrongly
does.
2017-02-21 14:38:35 +01:00
Paulo Matias
46fee994d1 os_subnet: add support for using the default subnetpool (#20191)
Allows to pass use_default_subnetpool instead of a cidr. This is
required when adding an IPv6 subnet if BGP or prefix delegation is
enabled.
2017-02-21 14:27:59 +01:00
Peter Sprygada
2567e8157f fixes bug where handle_prompts failed if list of prompts provided (#21711)
This will now automatically convert the prompts to a list and iterate
over the regexp looking for a prompt match before supplying the answer.
2017-02-21 08:27:33 -05:00
Tim Rupp
96bdb01888 Adds the txcontent manager import for bigip (#21700)
as it is used by some modules and it should be part
of the regular imports
2017-02-21 10:39:54 +00:00
Dag Wieers
b0c6ebf3fc win_shortcut: Clean up parameter handling (#21378)
* win_shortcut: Clean up parameter handling

Minor changes.

* Implemented -WhatIf:$check_mode support
2017-02-21 10:25:45 +00:00
Dag Wieers
b0fdb6ac10 win_timezone: Clean up and check-mode support (#21387)
Changes include:
- Use Get-AnsibleParam with -type support
- Replace $result PSObject with normal hash
- Add check-mode support
2017-02-21 06:01:09 +00:00
Ivan Bojer
21ed43e38a panos module to activate FW licenisng using authentication code (#20154) 2017-02-20 22:23:21 -05:00
Ivan Bojer
dafeb42c2d Panos interface (#20659)
* new module to manage DP interfaces

* - copyright change for the new module

* doc changes as requested
2017-02-20 22:22:22 -05:00
Barry Peddycord III
d1efc8e19e New Networking Module: NCLU (#21101)
* Adding Cumulus NCLU module

* Delete incorrect testing folder

* wrong import location for nclu test

* another wrong import location for nclu test

* unittest library doesn't support 'skip', removing 'real' nclu tests

* Don't need stringio since I'm not doing real tests

* got rid of unnecessary shebang in test_nclu

* version set to 1.0

* Documentation fixes
2017-02-20 22:21:34 -05:00
Peter Sprygada
e4a2c804be partial revert of changes introduced in d5f7a0181b (#21688) 2017-02-20 15:37:14 -05:00
Wayne Witzel III
4632b65086 add Ansible Tower role module (#21592)
* add Ansible Tower role module

* remove owner as choice from role paramenter
2017-02-20 15:18:43 -05:00
Wayne Witzel III
96772719ba add Tower JobTemplate module (#21681)
* add Tower JobTemplate module

* add host_config_key and remove defaults from required parameters
2017-02-20 15:18:04 -05:00
Wayne Witzel III
a59c4d558d add Ansible Tower team module (#21593) 2017-02-20 15:16:32 -05:00
Sloane Hertel
26b10eb160 [modules] Fix bad usages of traceback.format_exc(); doesn't take an error parameter (#21678) 2017-02-20 13:27:39 -05:00
Damien
d9e4248c35 Add doc link to aos_login module (#21684) 2017-02-20 18:15:40 +00:00
Dag Wieers
00668b1544 win_webpicmd: Clean up parameter handling (#21376)
Changes include:
- Use of Get-AnsibleParam and parameter types
- Replace $result PSObject with normal hash
2017-02-20 17:28:25 +00:00
Adrian Likins
d44c80280e Fix vault cli errors on 'encrypt_string_read_stdin' (#21675)
'encrypt_string' only options were being referenced when using
other vault subcommands. That code is moved inside a check
for 'encrypt_string' action now.
2017-02-20 11:38:41 -05:00
Tim Rupp
f37bc92924 Adds required_one_of to f5 utils class (#21650) 2017-02-20 16:01:31 +00:00
Marc Abramowitz
e2e4a69425 hashi_vault: Get token from env var or file
This allows getting the Vault token from the `VAULT_TOKEN` env var or
from the file `$HOME/.vault-token`, as both of these are understood by
the Vault CLI and are a common place to put Vault tokens. This allows
avoiding hard-coding a Vault token into playbooks or having to include
lookups.

`HOME/.vault-token` is nice because a user can authenticate with the CLI
using `vault auth` and then the token will be stored in
`$HOME/.vault-token`. If we read this file, then we allow someone to do
`vault auth` "out of band" to set up Vault access.
2017-02-20 10:10:22 -05:00
Dag Wieers
aae1a00d7e win_say: Clean up and check-mode support
Changes include:
- Clean up parameter handling
- Replace $result PSObject with a hash
- Added check-mode support
2017-02-20 10:02:11 -05:00
René Moser
576ff0728d service: deprecate state=running (#21499)
* service: deprecate state=running

* deprecated with version 2.7
2017-02-20 09:34:52 -05:00
Jordan Borean
a80251ff02 Added win_region module (#19147) 2017-02-20 11:50:27 +00:00
Dag Wieers
1cc9e9f2a1 Clean up windows setup module (#21343)
The following items were implemented:
- Replace PSObject with normal hash
- Replace Set-Attr function with normal hash assignment
- Re-indent code (make sure everything uses 4 spaces)
- Remove trailing semi-colons
2017-02-20 11:49:52 +00:00
Dag Wieers
3c45c93d10 win_reg_stat: Clean up parameter handling (#21380) 2017-02-20 11:49:36 +00:00
Dag Wieers
958cbae7ba win_tempfile: New module implementing tempfile on Windows (#21623)
This module implements the **tempfile** module for Windows.
2017-02-20 11:48:55 +00:00
Aliaksandr Kharkevich
7bc7f13856 Add validate_certs options to gitlab_user and gitlab_group modules (#21415) 2017-02-20 10:43:36 +01:00
Peter Sprygada
bd036c15e0 minor fixes to junos action (#21643)
* adds instrumentation messages
* checks cli context is not in config mode
2017-02-19 18:04:00 -05:00
Peter Sprygada
ce9180b3a1 roll up of vyos action fixes (#21642)
* check cli context is not in config mode
* add display messages for more details
2017-02-19 17:37:16 -05:00
Peter Sprygada
8472ed640b fixes minor bugs in nxos action (#21641)
* checks cli context is correct
* adds display messages
2017-02-19 17:13:14 -05:00
Peter Sprygada
c06b10eedd fix play_context connection_user attribute (#21640)
The connection user needs to be set from the original play_context and
not the copy.  This fixes that problem
2017-02-19 17:11:48 -05:00
David Norman
9b166f6f29 Grammar and spelling on win_iis_webapplication. (#21618) 2017-02-19 18:01:58 +00:00
Peter Sprygada
d5f7a0181b roll up of eos fixes (#21629)
* fixes error where eos would close the cli shell
* fixes network_cli connection plugin to check before calling open_shell()
* fixes json commands being sent over eapi
2017-02-19 08:46:14 -05:00
Peter Sprygada
76c9ad9dfc new module nxos_system (#21627)
* provides declarative config support for nxos system attributes
* adds unit test cases for new module
2017-02-18 18:56:02 -05:00
Peter Sprygada
2f10bdf0c7 roll up of fixes in junos action plugin (#21624)
* calls open_shell() or open_session() depending on connection type
* closes shell after module completion
* adds open_session() to netconf
2017-02-18 17:20:03 -05:00
Brian Coca
c68d81fe4f added check_ps common function 2017-02-18 13:06:09 -05:00
Peter Sprygada
920f9f4815 fixes nxos nxapi implementation (#21615)
* correctly maps play_context to nxapi values
* fixes bug in nxos_nxapi module detecting nxapi feature
* updates nxos shared lib provider values
* fixes missing ssh_keyfile in nxos shared lib
2017-02-18 11:20:26 -05:00
Trond Hindenes
eb6956e1dd win_nssm improvements (#21290)
* win_nssm improvements

* updated version_added
2017-02-18 15:19:12 +00:00
Peter Sprygada
912877c3dd adds no_log to provider arg in iosxr shared lib (#21617) 2017-02-18 09:29:29 -05:00
Peter Sprygada
c875393916 roll up of fixes for vyos base (#21616)
* adds ssh_keyfile to vyos
* fixes play_context mapping to provider
* adds missing network_os to play_context
* executes close_shell() after module completes
2017-02-18 09:29:17 -05:00
Peter Sprygada
e6dfbf63f6 fixes eos action mapping of play_context values (#21614)
* adds mapping for ssh_keyfile
* adds correct mappings for eapi
* fixes missing no_log value for provider arg
2017-02-18 09:29:06 -05:00