Commit graph

23358 commits

Author SHA1 Message Date
Jérémy Lecour
aa10266d55 [backport 2.7] Lineinfile must not insert lines multiples times with insertbefore/insertafter (#50084)
* Change test suite to fit expected behaviour

This reverts some changes from ansible/ansible@723daf3
If a line is found in the file, exactly or via regexp matching, it must
not be added again.
insertafter/insertbefore options are used only when a line is to be
inserted, to specify where it must be added.

(cherry picked from commit 31c11de2af)

* Implement the change in behaviour mentioned in the previous commit

(cherry picked from commit a4141cfa2e)

* Fix comment to reflect what the code does

(cherry picked from commit 150f5cb232)

* Set the correct return message.

In these cases, the lines are added, not replaced.

(cherry picked from commit 3216c31401)

* Add a changelog

(cherry picked from commit c39cf6b332)
2019-01-07 10:08:38 -08:00
Deepak Agrawal
913b1b0194 Backport/2.7/49922: network_cli - ansible_command_timeout not working as expected (#50068)
* network_cli - ansible_command_timeout not working as expected (#49922)

* fix for command_timeout

Signed-off-by: Deepak Agrawal <deepacks@gmail.com>

* fix ci warning

Signed-off-by: Deepak Agrawal <deepacks@gmail.com>

* fix review comments

Signed-off-by: Deepak Agrawal <deepacks@gmail.com>

(cherry picked from commit 0f2f38b044)

* changelog entry for 2.7 backport

Signed-off-by: Deepak Agrawal <deepacks@gmail.com>
2019-01-07 10:07:02 -08:00
Felix Fontein
47228b8cf1 [2.7] certificate_complete_chain: fix stacktrace on parsing error (#49988)
* Fix stacktrace when fail_on_error is False and a file cannot be parsed. (#49987)


(cherry picked from commit 65d5f1a4ef)

* Add changelog.
2019-01-07 09:28:59 -08:00
Michael Rose
898ec291b0 Backport/2.7/49084 (#49973)
* influxdb_user: Fixed default password behavior (#47040)

(cherry picked from commit 1eed8900ed)

* Amends #47040 - influxdb_user - Prevents potential accidental password changes to blank (#49084)

* Amends #47040 - Prevents potential accidental password changes to blank

* Added changelog fragment

(cherry picked from commit b422c59ada)
2019-01-07 09:25:36 -08:00
Adam Miller
b710b40a0c Fix yum/dnf handling of URIs that don't end in .rpm (#49912)
Fixes #49727

Signed-off-by: Adam Miller <admiller@redhat.com>
(cherry picked from commit 0eabb8097b)
2019-01-07 09:24:21 -08:00
Dave Bendit
a11e0c184a Docker common consolidation (#49707)
* [docker] Consolidating Python Boolean conversion for Docker API (#49563)

* [docker] Consolidating docker option min version checks (#49564)

* [docker] Moving option min version checks out of docker_swarm (#49564)

Also renaming Boolean cleanup function and fixing docker_container minimum
version check for network interfaces.

* Cleanup from PR feedback
2019-01-07 09:20:34 -08:00
Dave Bendit
5a7f7f1183 [docker_container] Fixes idempotency checks for network_mode (#49797)
Fixes #49794
2019-01-07 09:20:34 -08:00
Alexander Bethke
afd626e0b3 Fix two regressions in flatpak and flatpak_remote modules (#49651)
* Fix python 3 compatibility in flatpak_remote module

* Fix flatpak module for recent versions of flatpak

* Add reminder for contributors to run integration tests manually

There has been several Python version compatibility regressions
introduced into the module which could have been avoided by the
integration tests.

(cherry picked from commit 27fd8e4dc6)
2019-01-07 09:19:48 -08:00
Sam Doran
17109ecedd [stable-2.7] Reboot - Fix command not found, add Apline support, fix Solaris command (#49272)
* Fix various bugs related in reboot

- Use format strings for consistency and improve debug log messages
- Use local variables instead of class attributes in order to be thread safe
- Run setup module to get distribution and version
- Run find module to get full path of shutdown command
- Use ansible_os_family and ansible_distribution to find commands and args
- Use same command for all Solaris/SunOS distributions
- Move delay calculations to properties
- Reliably check for module run failure
- Fix bug in run_test_command() that accidentally made the method work properly
- Use better exceptions rather than Exception
- Use dict literals rather than constructors
- Correct _check_delay() so it always returns a value, not None
- Don't store and return result in run_test_command() because it's not used anywhere
- add test for post reboot command that fails
- test negative values for delay parameters.
(cherry picked from commit c1589c33c4)

Co-authored-by: Sam Doran <sdoran@redhat.com>
2019-01-07 09:16:58 -08:00
Thomas Picariello
2f622fc336 Do not try to encode metadata if it is None (#46739)
* Do not try to encode metadata if it is None

* Add changelog fragment

* Fix fragment missing EOF line
2019-01-07 09:14:30 -08:00
Tom Dietrich
1bd3adf4f4 Warn of standard behavior of 'default' key store (#49903) (#50122)
* Warn of standard behavior of 'default' key store 
The default key store typically results in the key being stored as user. In instances where we're trying to install a cert to enable SSL binding in IIS, this will result in an unbind-able cert, as the IIS APPPOOL identity will not be able to read the private key, and presents a very cryptic error of 'A specified logon session does not exist'.
* specify what's required for successful iis import
- store_location's default value is currently 'LocalMachine' but if this changes it could result in the documentation being inaccurate
- key_exportable is not required for a successful IIS import
Co-Authored-By: tdietrich513 <tom.dietrich@gmail.com>
(cherry picked from commit 2b48c0187c)
2018-12-19 11:21:19 -06:00
Toshio Kuratomi
de9647f260 Update Ansible release version to v2.7.5.post0. 2018-12-13 14:08:58 -08:00
Toshio Kuratomi
a771ed93ab New release v2.7.5 2018-12-13 09:26:14 -08:00
Toshio Kuratomi
012d38eae6
[stable-2.7] openstack: fix parameter handling when cloud provided as dict (#42899) (#49745)
* [stable-2.7] openstack: fix parameter handling when cloud provided as dict (#42899)

* openstack: fix parameter handling when cloud provided as dict

If a cloud is provided as dictionary:

 * Do not assert that 'interface' parameter is None. Instead,
   assert that it is 'public'.
 * Assert that 'auth_type' parameter is not set.

Fixes #42858

* os_user: Include domain parameter in user lookup

If a "domain" parameter is provided, use it in looking up
whether the user already exists.

Fixes #42901

* os_user: Include domain parameter in user deletion

If a "domain" parameter is provided, use it in deleting
the user also.

Fixes #42901
(cherry picked from commit e25dac9)

Co-authored-by: Carsten Koester <carsten@ckoester.net>

* Add changelog for openstack fixes
2018-12-10 12:33:34 -08:00
Sandra McCann
87e01a0640 added dhcp standard options (#49729)
(cherry picked from commit 418c03a686)
2018-12-10 11:51:45 -08:00
Felix Fontein
2566219fc8 [2.7] docker_swarm: fix minimal API version (#49709)
* docker_swarm: fix minimal API version (#49691)

* Reduce minimally required docker API version to 1.25, with selective features requiring 1.30.

* Adjust test requirements.

* Forgot some imports.

(cherry picked from commit 495a426039)

* Add changelog for docker swarm minimum api fix
2018-12-10 11:49:36 -08:00
Brian Coca
0954942dfd ensure ssh retry respects no log (#49569) (#49724)
* ensure ssh retry respects no log (#49569)


(cherry picked from commit ba4c2ebeac)
2018-12-10 11:49:16 -08:00
Dario Zanzico
961382bf5e docker_swarm_service: ensure idempotency when the user parameter is None (#49235)
* ensure idempotency for user set to None

* Update `user` documentation and add changelog fragment

* clarify changelog fragments and parameters documentation

* use restructuredtext syntax in changelog fragment

(cherry picked from commit b183eb4464)
2018-12-10 11:48:48 -08:00
Sandra McCann
291c9388ea added jinja2 example (#49740) 2018-12-10 11:40:21 -08:00
Abhijeet Kasurde
d28a903fb3 VMware: update docs and return docs for vmware_host_service_facts (#49736)
Follow up of 45155

(cherry picked from commit be21140384)
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2018-12-10 11:13:26 -08:00
Brian Coca
35f349ae10 match interpreter on stdout also (#49446)
fixes #46980

(cherry picked from commit 758ac1846b)
2018-12-10 10:34:50 -08:00
Dag Wieers
5b349773b0 mail: Fix new breakage on python 2.7 (backport) (#49222)
* mail: Fix new breakage on python 2.7

* Add changelog fragment

* Add basic SMTP testing

* Add SMTP integration tests using starttls and TLS
2018-12-10 10:26:02 -08:00
Dag Wieers
2ba095f89e aci_rest: Fix ignoring custom port 2018-12-10 10:22:41 -08:00
Felix Fontein
db8f13c702 docker_*: hint at DOCKER_CONFIG environment variable (#49689)
* Hint at DOCKER_CONFIG environment variable directly supported by docker-py.

* Adjust wording.

(cherry picked from commit 270b6a2ee2)
2018-12-10 10:20:39 -08:00
Andrey Che
5b54472cfd fix synchronize handling of encrypted hosts on delegation (#49460)
* Fix for #49363

* Replaced str() with to_text() as more python version safe

* Changed to comply to errors stragegy

(cherry picked from commit 64636d9de0)
2018-12-10 10:18:30 -08:00
Yuwei Zhou
0dda61c258 Fix if the route table changed to none (#49533) (#49703)
* Fix if the route table changed to none (#49533)

(cherry picked from commit 5a59748e6c)

* add changelog
2018-12-10 10:17:42 -08:00
lrrb
06ffe7b5d8 fix: Make sure that the files excluded when extracting the archive are not checked (#45122) (#49700)
*  fix: ensure than all item of a list of excluded files aren't checked  (#45122)

* fix: ensure than list of excluded files aren't checked
* test: exclude a list of files

(cherry picked from commit 4f9f1754b4)

* added changelog
2018-12-10 10:15:22 -08:00
Toshio Kuratomi
ad45bd72c1 Fix for a caching traceback
When the user specified caching plugin doesn't initialize correctly, we
were falling back to a dict.  however, dicts do not have the same
update() method as the FactCache.  We use the update method when we
update a cache with a subsequent value.  So when that combination of
things happened, the code would traceback.

In devel, we made this change to fix things: https://github.com/ansible/ansible/pull/49516
but that involves several deprecations.  So we're doing this smaller
hack in 2.7 to fix the traceback without introducing those deprecations
in a stable release.
2018-12-06 10:59:32 -08:00
Matt Martz
dc9bb38d72 [stable-2.7] Make squash deprecation messages less misleading (#49551)
(cherry picked from commit 69d230f)

Co-authored-by: Matt Martz <matt@sivel.net>
2018-12-06 10:01:35 -08:00
Thomas Picariello
768ad30fbc Fix google auth scoping for unscoped credentials (#46740)
* Fix google auth scoping for unscoped credentials

* Add changelog fragment

(cherry picked from commit c8ecac8dc2)
2018-12-06 09:43:35 -08:00
Josue David Hernandez
35e02293d5 Adding support for clearlinux showing release nuber (#47101)
Signed-off-by: Josue David Hernandez <josue.d.hernandez.gutierrez@intel.com>
(cherry picked from commit 8880c72682)
2018-12-06 09:39:12 -08:00
Matt Martz
acdd4cbfcd [stable-2.7] Support version 3 of the redis python library (#49445)
* Support version 3 of the redis python library. Fixes #49341

* Document 2.4.5 minimum redis-py version
(cherry picked from commit 77de219)

Co-authored-by: Matt Martz <matt@sivel.net>
2018-12-06 09:36:00 -08:00
Josue David Hernandez
1af07cc38f Fix for changes in clearlinux (#49344)
* Fix for changes in clearlinux

clearlinux is now providing /etc/os-release file and ansible is identifying as NA
then this change allow ansible to find it

Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez.gutierrez@intel.com>

* Add changelog fragment for clearlinux changes

Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez.gutierrez@intel.com>
(cherry picked from commit 6d42c5020a)
2018-12-06 09:34:20 -08:00
Abhijeet Kasurde
e0f910abcb Handle special service where package is not available (#45155)
There are several services e.g. vmware-fdm, which does not have package name and
package description which will raise a error if queried for.

(cherry picked from commit b3b65d16b8)
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2018-12-05 10:40:55 -08:00
Yuwei Zhou
bc80087cca azure_rm_image: fix creation of image with data disks (#49394) (#49518)
* azure_rm_image: fix creation of image with data disks (#49394)

(cherry picked from commit 79c0e30c5a)

* Create 49394_azure_image.yml
2018-12-05 10:40:19 -08:00
mattandes
9cc7f7bcf2 Fix win_nssm credentials quoting (#48761)
* Fix win_nssm credentials quoting

Fix credential quoting for win_nssm after changes to the way nssm command is invoked in Ansible 2.7.1.

* Updating nssm command to update credentials to use Argv-ToString to properly escape password variable.

* Adding changelog fragment for fix of #48728.

(cherry picked from commit 15c5dbcc20)
2018-12-05 10:35:59 -08:00
Sam Doran
91b2347344 [stable-2.7] Use IndexError in exception (#49488)
(cherry picked from commit 6200d32c0d)

Co-authored-by: Sam Doran <sdoran@redhat.com>
2018-12-05 10:34:28 -08:00
Peter Sprygada
799f8e97b3 fixes an issue with dict_merge in network utils (#41107)
This change address a problem where the dict_merge function would fail
due to the value being a nested dict.  This will now recursively pass
the value back through the dict_merge function.
Merge to devel https://github.com/ansible/ansible/pull/41107

(cherry picked from commit 2a4be2748f)

Update changelog

Fix review comments
2018-12-05 10:32:15 -08:00
Sam Doran
a928ea4d93 [stable-2.7] Reboot - Fix errors when using Paramiko connection (#49002)
Different connection plugins return different data when throwing exceptions. The Paramiko connection plugin does not return a text sting, which caused an exception.

The ssh connection plugin returns multi-line errors, which makes the debug logs harder to read. Only return the last line in that case in order to make the logs more readable.

When experiencing a connection failure, reset the connection.

Add reset() to paramiko_ssh

Indicate thet conection state is False when running close(). This is needed by the ensure_connected() decorator to work properly.

Co-authored-by: Matt Martz <matt@sivel.net>
(cherry picked from commit 5eb7f5781e)

Co-authored-by: Sam Doran <sdoran@redhat.com>
2018-12-04 10:10:23 -08:00
Abhijeet Kasurde
35d84ccc3a VMware: Fix module usages in module_utils (#49421)
* VMware: Fix module usages in module_utils
* Skip test for Python 2.6 as SSL context is not available in Python 2.6

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit 1b04571ea0)
2018-12-04 07:32:06 -08:00
Xaroth
99612b8224 [stable-2.7] -Fix: The Ubuntu 14.04 image on Shippable runs an old version of python, causing issues with checking out bitbucket, adjust tests to compensate. (#49433)
-Add: Mention bitbucket dropping TLSv1 and TLSv1.1 support as per 01 Dec 2018, potentially causing issues with older clients.
(cherry picked from commit a6db7f7abd)

Co-authored-by: Xaroth <xaroth+github@xaroth.nl>
2018-12-04 07:08:30 -08:00
Vinay Dandekar
aed38b12cd [aws] Revert back to getting the AWS role name from the URI (#49427)
* Revert back to getting the AWS role name from the URI with a small change (#49113)

- The role name and instance profile name _can_ be different
- Change the delimiter to `:` for keys that are discovered through the JSON parsing (which is not a valid delimiter for AWS IAM role names), this delimiter is still converted to underscore
- Now checks for the existence of that delimiter to remove the cases where the JSON keys are appended to the role name to find the role name

(cherry picked from commit ff9b86f560)

* Changelog update
2018-12-04 07:02:00 -08:00
Corey Wanless
949b8e991e [Backport 2.7] sets admin_password to no_log in na_ontap_cifs_server (#49412)
* sets admin_password to no_log

(cherry picked from commit 1d321cef6e)

* adds change log for ontap cifs server no_log
2018-12-04 07:00:33 -08:00
John R Barker
69e1d0f425 Backport/2.7/48933 (#49400)
* comparing StorageConnection.password breaks idempotency (#48933)

(cherry picked from commit 5cd31578cc)

* changelog
2018-12-04 06:59:10 -08:00
Adam Miller
12e088ff93 dnf module load/init dnf pkg mgr plugins properly (#49278)
* dnf module load/init dnf pkg mgr plugins properly

Fixes #45940

Signed-off-by: Adam Miller <admiller@redhat.com>
(cherry picked from commit 378cc9668c)
2018-12-03 18:41:24 -08:00
Pilou
2aa0f366d2 templar: ensure that exceptions are handled, fix 'AttributeError' (#48792)
* templar: ensure that exceptions are handled

* Fix AttributeError: object has no attribute 'message'

'message' attribute is deprecated since Python 2.6 and not available
with Python 3.

Simple reproducer:

    - hosts: localhost
      vars:
        not_json: "{{ 'test str' | from_json }}"
      tasks:
        - command: "echo {{ not_json }}"

(cherry picked from commit 62c05033d6)
2018-12-03 18:40:42 -08:00
joaocpinto
91d3857c36 Cast int for expire field to avoid call failure to sensu API (#33239)
(cherry picked from commit bbab4c1b49)

* Cast int for expire field to avoid call failure to sensu API (#33239)

* Add changelog
2018-12-03 18:36:32 -08:00
Dusan Matejka
6ba6627338 Fixed support for LLD type user macros and added missing validate_certs attribute
(cherry picked from commit 7af8c0e07e)
2018-12-03 18:35:30 -08:00
Felix Fontein
0ae615de98 ACME: fix bug introduced in #49266, work around problem with Pebble (#49407)
(cherry picked from commit 34c57b4c42)
2018-12-03 17:05:57 -08:00
Felix Fontein
1deb2300a4 ACME: improve error handling (#49266)
* Improve error handling: when parse_json_result is False, still return the error message.

* Remove content body from info dict.

* Add changelog.

(cherry picked from commit b842b1b97e)
2018-12-03 17:05:57 -08:00