Commit graph

273 commits

Author SHA1 Message Date
Sam Doran
306be9f23c Fix pause module so it does not stack trace when redirecting stdout. (#42217) (#42441)
* Use separate variables for stdin and stdout file descriptors

* Do not set stdout to raw mode when output is not a TTY

(cherry picked from commit 1d1595b990)
2018-07-23 09:20:14 -07:00
Matt Davis
0c985fee8a New release v2.5.6 2018-07-05 11:49:44 -07:00
Trishna Guha
dc6a187603 nxos and eos bugfix pick-2.5 (#42289)
* fix nxos_vxlan_vtep_vni issue (#42183)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 981c9f6a79)

* Update eos_l2_interface.py (#42270)

(cherry picked from commit 51092c6ea5)

* update changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-07-05 09:42:12 -07:00
Sam Doran
0fa56ed65d Add warning when using an empty regexp in lineinfile (#42013) (#42207)
* Revert "Account for empty string regexp in lineinfile (#41451)"

This reverts commit 4b5b4a760c.

* Use context managers for interacting with files

* Store line and regexp parameters in a variable

* Add warning when regexp is an empty string

* Remove '=' from error messages

* Update warning message and add changelog

* Add tests

* Improve warning message

Offer an equivalent regexp that won't trigger the warning.
Update tests to match new warning.

* Add porting guide entry for lineinfile change

(cherry picked from commit fb55038d75)
2018-07-05 09:41:07 -07:00
Abhijeet Kasurde
eef9d0bf04 Restore BOOLEANS import in basic.py (#42008) (#42235)
This import was removed by mistake. This is required for backward
compatibility.

Fixes: #41988

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2018-07-03 13:29:16 -07:00
René Moser
eda69dff92 [2.5] influxdb_query: fix use of common return (#42231)
* influxdb_query: fix use of common return results (#39626)


(cherry picked from commit aa874c3c36)

* changelog: influxdb_query fix use of common return
2018-07-03 13:28:51 -07:00
John R Barker
7dc06bed83 Backport/2.5/42209 (#42213)
* nsupdate.py: Fix typo (#42209)

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit 9539284010)

* nsupdate_fix_hmac-sha384
2018-07-03 13:28:26 -07:00
Toshio Kuratomi
ff980afefd [stable-2.5] ignore ansible.cfg in world writable cwd (#42070) (#42142)
* [stable-2.5] ignore ansible.cfg in world writable cwd (#42070)

* ignore ansible.cfg in world writable cwd
 * also added 'warnings' to config
 * updated man page template
(cherry picked from commit b6f2aad)

Co-authored-by: Brian Coca <bcoca@users.noreply.github.com>

* Update wrcwd_ansible.cfg.yml
2018-07-03 13:26:57 -07:00
Toshio Kuratomi
10d6fe6c98 [stable-2.5] avoid loading vars on unspecified basedir (cwd) (#42067) (#42139)
* avoid loading vars on unspecified basedir (cwd)
(cherry picked from commit de0e11c)

Co-authored-by: Brian Coca <bcoca@users.noreply.github.com>
2018-07-03 13:23:58 -07:00
Ganesh Nalawade
f942d71b36 Fix junos_config confirm commit issue (#41527) (#42099)
Fixes #40626

* Due to issue in ncclient commit() method for Juniper
  device (ncclient/ncclient#238)
  add a workaround in junos netconf plugin to generate proper
  commit-configuration xml and execute it using ncclient
  generic `rpc()` method.

* Update junos_config doc

* Update changelog

(cherry picked from commit 88b966e23b)
2018-07-03 13:23:04 -07:00
Brian Coca
fdb813766a service_facts correct meaning of state for systemd service units (#40914) (#42068)
* service_facts correct meaning of state for systemd service units

Fixes #40809

Previously this module used the commend `systemctl list-unit-files
--type=service` to query state of services but list-unit-files only
shows enabled vs disabled which is not what we want for "state"

Signed-off-by: Adam Miller <admiller@redhat.com>

* make sure to define service_name before referencing it

Signed-off-by: Adam Miller <admiller@redhat.com>
(cherry picked from commit bf1cc2f1f4)
2018-07-03 13:22:30 -07:00
Jordan Borean
ceb14fcc33 win_domain: fix typo in cmdlet call (#41993) (#41994)
(cherry picked from commit 77526a5036)
2018-07-03 13:20:09 -07:00
Jordan Borean
c2d905fc11 win_iis_webapppool: do not output some cmdlet outputs (#41884) (#41942)
(cherry picked from commit abfcc35e6f)
2018-07-03 13:18:10 -07:00
Sam Doran
ab93ad8a0a Backport #41767 for 2.5 -Skip if insertbefore is using BOF until later in the module (#41930)
* Skip if insertbefore BOF until later (#41767)

If a line match is found in the file and no regexp is specified, insertbefore would improperly try to add a line if set to BOF.

Add tests for this scenario.

(cherry picked from commit eaae1318f8)

* Add changelog fragment
2018-07-03 13:08:49 -07:00
Matt Martz
916317466d Backport #41860 for 2.5 - support group_by with implicit localhost (#41926)
* Use inventory.get_host instead of direct access to inventory.hosts (#41860)

* Use inventory.get_host instead of direct access to inventory.hosts. Fixes #32152

* Prevent potential side effect, by using self._inventory.localhost directly instead of get_host

(cherry picked from commit 1a2ef0922f)

* Add changelog for #41860
2018-07-03 12:08:58 -07:00
Jordan Borean
9757233a93 Stop displaying kinit pass input on a failure (#41882) (#41923)
* Stop displaying kinit pass input on a failure

* Fixed up minor logic info and added tests

(cherry picked from commit 9b7b564d75)
2018-07-03 12:08:26 -07:00
Brian Coca
e9a32c1107 fix vars hostname fallback (#41858)
also made it optimistic, rely on exceptions instead of copmlex if chains

(cherry picked from commit 11dbed1350)
2018-07-03 12:06:23 -07:00
Brian Coca
40c47b7785 fix minor issues with debug and item labels (#41331) (#41815)
* fix minor issues with debug and item labels

 - no more `item=None`, we always have a label now
 - debug should only show expected information, either msg= or the var in var=
 - also fixed method name, deprecated misleading _get_item

(cherry picked from commit 27c43daab8)
2018-07-03 12:05:13 -07:00
Nilashish Chakraborty
b9904b9fe7 Fix vyos_vlan aggregate issue & added tests CP into 2.5 (#41638) (#41775)
* Fix vyos_vlan aggregate issue & added tests (#41638)

* Fix vyos_vlan aggregate issue & Added tests

* Fix #2 for vyos_vlan aggregate issue

(cherry picked from commit 837c216587)

* Added changelog for vyos_vlan aggregate issue fix
2018-07-03 12:02:11 -07:00
Martin Krizek
dcf95a3adc Backport 2.5: apt: fix apt-mark on debian6 (#41724)
* apt: fix apt-mark on debian6 (#41530)


(cherry picked from commit 2e68811c34)

* Add changelog/fragment
2018-07-03 12:01:36 -07:00
Brian Coca
36b0756c3b update play_context for reset_connection (#40866) (#41655)
steps taken from lib/ansible/executor/task_executor.py

fixes: https://github.com/ansible/ansible/issues/27520
(cherry picked from commit 23fbe0ce8e)
2018-07-03 11:58:49 -07:00
Trishna Guha
15ac94f87c fix nxos_linkagg issue (#41550) (#41620)
* fix nxos_linkagg issue (#41550)

* fix nxos_linkagg issue

* fix shippable

(cherry picked from commit 119e6d680b)

* changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-07-03 11:50:57 -07:00
Toshio Kuratomi
7b325baa22 Bkprt recursive copy fix (#40268)
* Fixes #34893 (#40166)

Fixes several bugs exposed in #34893
* Fixes relative path handling in copy so that it splits directories and
  reconstructs the correct file path
* Return failed in the proper circumstances

(cherry picked from commit ca4147f2cc)

* Add changelog for recursive copy fix

(cherry picked from commit cab0f21564)
2018-07-03 11:49:45 -07:00
Jordan Borean
2f0cfa857a win_updates fix when win_updates is run with async (#41756) (#41763)
(cherry picked from commit 11bd3fd318)
2018-06-20 16:27:53 -07:00
Matt Davis
5f6e1a70a6 New release v2.5.5 2018-06-14 14:14:39 -07:00
Trishna Guha
68134cc635 Don't retrieve config in running_config when config is provided for diff stable 2.5 (#41557)
* don't retrieve config in running_config when config is provided for diff (#41400)

* don't retrieve config in running_config when config is provided for diff

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix for eos, nxos

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* add integration test

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 8ab0d654f3)

* add changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-06-14 11:55:58 -07:00
Toshio Kuratomi
d9c5614b92 Make admin_users only contain root and toor because admin is used for non-privileged accounts (#41352)
This fixes one specific instance of failure to chown from a privileged
account:
https://github.com/ansible/ansible/issues/16052#issuecomment-384976615

Fixes #41160

(cherry picked from commit 461a2733e6)
2018-06-14 09:50:28 -07:00
Toshio Kuratomi
698b8e04f3 Bkprt nolog fix (#41453)
* no_log even when task_result doesn't provide key

 - now also checks task property
 - added reproducer to tests for unreachable status on item loop

(cherry picked from commit 336b3762b2)

* Add changelog entry for the no_log fix

(cherry picked from commit 5fdd101a3e)
2018-06-12 12:28:29 -07:00
Trishna Guha
8fe99ae001 Fix nxos_l3_interface no switchport issue with loopback and svi interfaces, nxos_snapshot issue (#41318)
* Fix nxos_l3_interface no switchport issue with loopback and svi interfaces

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* Fix nxos_snapshot compare (#41386)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 1998707eda)

* changelog nxos_snapshot

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-06-11 09:21:49 -07:00
Nilashish Chakraborty
da67d279be Fixes eos_logging idempotence CP into 2.5 (#40931)
* Fixes eos_logging idempotence issue #31862 (#40604)

* eos_logging idempotence fix

* fixed eos_logging idempotence issue

* Fixed pylint and pep8 errors

* Added tests for eos_logging & minor fix

* Removed q statements

(cherry picked from commit b9ea646839)

* Added changelogs for eos_logging idempotence fix

* changelog tweak
2018-06-07 17:15:56 -07:00
Sloane Hertel
fe2520a830 2.5 backport #40826 to fix async for aws_s3 (#41276)
* cherry-picked from 89cea78e30 and fixed merge conflicts from restructuring the integration tests in devel

Fix async for aws_s3

Add a test that async is able to be used on aws_s3 tasks

(cherry picked from commit cef92e3942cdd76866c47d25f903625e6d7eb6ed)

* changelog format tweak
2018-06-07 17:12:13 -07:00
Will Thames
1256fedd61 Fix ec2_ami block_device_mapping volume_size to be int in 2.5 (#40938) (#41217)
* Fix ec2_ami block_device_mapping volume_size to be int in 2.5 (#40938)

* fix ec2_ami block_device_mapping size to be int

* fixed cr issues

renamed `type` to `attribute_type`
reused `new_item` instead of creating new variable `value`

(cherry picked from commit ab96a84154)

* changelog

(cherry picked from commit e6cd727181cb6c7e08f9cbad44dc7d625e78406a)

* changelog format tweak
2018-06-07 17:10:45 -07:00
Sloane Hertel
125d1e3867 aws_s3: don't decrypt file before uploading - fixes #39287 (#39634) (#41205)
* aws_s3: don't decrypt file before uploading - fixes #39287 (#39634)

* aws_s3: do not decrypt file before uploading to bucket

* changelog

(cherry picked from commit 387c37e255)

* changelog format tweak
2018-06-07 17:09:58 -07:00
Nilashish Chakraborty
72ad0dd4ec Fix ios_logging idempotence CP into 2.5 (#41120)
* Fixes to ios_logging (#41029)

* Logging size may not show up in config

* This is much simpler

* Avoid repetition in tests

* Both options of buffered are optional

(cherry picked from commit 92a95368fe)

* Added changelog
2018-06-07 17:05:47 -07:00
Sloane Hertel
43cfb89c2a 2.5 backport #40720 - fix cache timeout behavior (#41018)
* Fix cache timeout behavior

(cherry picked from commit c1400ce909)

* changelog
2018-06-07 17:01:50 -07:00
Trishna Guha
ebc36eed8c fix nxos output truncated issue and nxos_banner issue (#40962)
* fix nxos output truncated issue

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* add changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix nxos_banner issue (#41026)

(cherry picked from commit b6afb77a8a)

* add changelog for nxos_banner fix

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-06-07 09:45:30 -07:00
Matt Davis
048690fdc4 New release v2.5.4 2018-05-31 14:56:01 -07:00
Matt Martz
959821f40e Backport #40833 for 2.5 - synchronize _remote_is_local (#40917)
* Use _remote_is_local=True for local connection in synchronize (#40833)

* All instances of local connection should use _remote_is_local=True. Fixes #40551

* Switch to instance attribute for synchronize

* Add test that shows that synchronize _remote_is_local addresses tmpdir building

(cherry picked from commit ad7ba91f75)

* Add changelog entry for #40833
2018-05-30 17:28:23 -04:00
Brian Coca
f1cd7a99be remove extra )
(cherry picked from commit 062f0444a1)
2018-05-30 16:28:58 -04:00
Brian Coca
5a77aceae5 fix 'doas' become_method support, previously committed patch not submitted to devel branch (#37511) (#40896)
* fix become_method 'doas' support by properly specifying becomecmd

a repatch of https://github.com/ansible/ansible/pull/13451/ which was never committed to 'devel' branch.

* fix play_context test for become_method doas to match new becomecmd

(cherry picked from commit be3670f528)
2018-05-30 16:03:58 -04:00
Brian Coca
f7f8d2b133 add keywords handling to ansible-doc (#40908)
also add check for sequence of string types before we force a join

(cherry picked from commit 73b9892605)
2018-05-30 12:32:25 -07:00
Sloane Hertel
b1c4d6310d Fix broken aws_ses_identity test - backport #39560 (#40350)
* Fix failing aws_ses_identity integration tests (#39560)

* Fix failing aws_ses_identity integration tests

Reduce boilerplate with yaml anchor

* remove unstable test alias

* Update feedback forwarding check to use desired state rather than
repeated API calls.

(cherry picked from commit 571c183f59)

* changelog
2018-05-30 10:43:02 -07:00
Brian Coca
be46ea7bf2 use correct object in error
fixes #40453

(cherry picked from commit 0339c8037b)
2018-05-30 12:53:15 -04:00
Trishna Guha
8e8b469416
nxos bugfixes 2.5.4 cherry-pick (#40861)
* Fix legacy Nexus 3k integration test and module issues. (#40322)

* Add setup ignore_errors for nxos_config test

* Fix parse_fan_info for n3k

* Skip bidir tests for N3k

* Omit vni config for n3k

* Skip unsupported nxos_vrf_af test on N3K

* Add legacy N3K platform tag

(cherry picked from commit 63e16431b7)

* Skip N35 and N3L platforms for nxos_evpn_global test (#40333)

(cherry picked from commit ad69ef88e7)

* add normalize_interface in module_utils and fix nxos_l3_interface module (#40598)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 0b7932db30)

* nxos_interface: Disable switchport for loopback/svi (#40314)

* nxos_interface: Disable switchport for loopback/svi

* Replace interface_type with get_interface_type(name)

(cherry picked from commit d04a989bd2)

* fixes bug with matching nxos prompts (#40655)

This change addresses an issue where the prompt matching regular
expressions would not match a prompt if the hostname starts with a
numeric value.  Before this change, the connection would fail with a
socket.timeout() error.  This change updates the termnal_stdout_re
values to now check for a number.

See Github issue #38639

(cherry picked from commit d829ff6993)

* fix nxos_vrf and migrate get_interface_type to module_utils (#40825)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit b4baa2d484)

* nxos_vlan fix

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* changelog nxos bugfixes 2.5.4

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-30 11:21:53 +05:30
Benoit Dunand-Laisin
116a504825 Fixes #24241 Module always updates installed plugins (#40645)
* Update jenkins_plugin.py

When setting state=latest, plugin are always updated because old sha1 is bytes and and is compared to new sha1 which is str (so it always detecting a sha1 change)

* Add changelog
2018-05-25 10:09:17 -04:00
Sam Doran
b20b29ac0a
Insert set commands if a delete command is entered (#40666) (#40672)
(cherry picked from commit 8b4e36e711)
2018-05-24 13:21:16 -04:00
Martin Krizek
18581adbb5
Backport: apt: don't markmanual if apt-mark is not installed (#40605)
(cherry picked from commit a3cfe0d72f)
2018-05-24 09:27:38 +02:00
Jordan Borean
12ac23bad3
Win get url auth 2.5 (#40642)
* Fixed WebRequest init (#40641)


(cherry picked from commit 4fbdc1a497)

* Added changelog fragment
2018-05-24 14:42:39 +10:00
Matt Martz
fac5a14ded Backport #40500 for 2.5 - synchronize fixes (#40545)
* Group logic detecting user, ensure rsync_opts is a list if omitted. Fixes #40483

(cherry picked from commit ea176427b4)

* Add changelog for #40500
2018-05-24 12:04:18 +10:00
Jordan Borean
a63b6d363b
winrm: add better exception handling for krb5 auth with pexpect (#39930) (#40634)
* winrm: add better exception handling for krb5 auth with pexpect

* Added changelog fragment

* Added exception handler in case kinit path isn't valid, added test cases

* fixed for Python 2 compatibility

(cherry picked from commit 5e28e282a5)
2018-05-24 07:17:21 +10:00
Sam Doran
02e66617f2
Make xenserver_facts actually work (#35821) (#40552)
* Get the str value of xmlrpc.client.DateTime

* get_all_records should be used instead of get_all

* Facts returned with 'ansible_facts'

* Remove some redundant code

* Add cheese as maintainer

* Add changelog entry

(cherry picked from commit d45b044992)
2018-05-22 14:01:19 -04:00
Sam Doran
dbcecb64b8
Fix ctrl+c in pause module and add tests (#40134) (#40480)
Backport # 40134 - Ensure Ctrl+C interrupt for pause module works in all cases
2018-05-22 13:11:21 -04:00
Sam Doran
4c279f5e45
EdgeOS module improvements (#39530) (#40548)
* Update docs and use to_text on strings

* Add warning to use network_cli

(cherry picked from commit d5dbd8c76d)
2018-05-22 12:52:57 -04:00
Sam Doran
9bef06ccd9
Add better error messages and checking to known_hosts (#38307) (#40502)
(cherry picked from commit 13aff08748)
2018-05-22 12:42:39 -04:00
Sam Doran
e877469533
Do not join flag parameters in iptables module (#36658) (#40501)
* Do not join flag parameters

This put a comma between every character of the tcp flag parameters, resulting in a bad iptables command.

Fixes #36490

* Use suboptions to ensure tcp_flags options are lists

* Add unit tests for tcp_flags

* Add example of how to use tcp_flags

(cherry picked from commit c9d3bb59a4)
2018-05-22 11:29:33 -04:00
Artem Goncharov
13c88fe2d2 fixes issue 39472: (#40379)
With python 3.6 spwd.getspnam returns PermissionError instead of
KeyError if user does not have privileges

(cherry picked from commit 0023b1ee9eca1286493c56ce5e1aa1b2272c3e39)
2018-05-22 11:29:00 -04:00
Jordan Borean
9d8d1de182
winrm: source user from options than remote_user (#40467) (#40516)
* winrm: source user from options than remote_user (#40467)

* winrm: source user from options than remote_user

* fixed up mock for kerberos import

* Added changelog fragment

* get hostname from option as well

(cherry picked from commit 1ac180c74d)

* Also removed uneeded method that wasn't backported
2018-05-22 10:46:13 +10:00
Jordan Borean
6eb0af96de
win_environment: Added explicit check for null, empty string with state=present (#40468) (#40508)
* win_environment: Added explicit check for null, empty string with state=present

* Added changelog fragment

(cherry picked from commit db195831fd)
2018-05-22 07:15:34 +10:00
Ryan S. Brown
d0cf81883c Move EC2 ASG changelog entry to correct directory 2018-05-18 13:57:52 -04:00
Matt Davis
778cb5bd8b New release v2.5.3 2018-05-17 16:29:23 -07:00
Sloane Hertel
84f9303c52 aws_ec2: tag values as hostnames - backport #35880 (#40325)
* aws_ec2 inventory: add support for tag values as hostnames (#35880)

(cherry picked from commit b345b79dcd)

* changelog
2018-05-17 08:59:20 -07:00
Sloane Hertel
ae2453850e aws_ec2 inventory plugin: backport/2.5/40240 (#40277)
* Add fallback check for IAM role temp creds (#40240)

* Add fallback check for IAM role temp creds

(cherry picked from commit d5a5e37fcf)

* changelog

* Fix changelog

* Fix fix changelog
2018-05-16 22:47:07 -07:00
Jordan Borean
8f09190100
win_updates: fix typo with download failure and whitelist on multiple updates (#40283) (#40292)
(cherry picked from commit 837aada4a8)
2018-05-17 08:55:21 +10:00
John R Barker
f791ec285c
Backport/2.5/37461 (#40252)
* Fixing lack of failure when uploaded source is invalid (#37461)

Checking the response status for 400 and throwing exception.
Unit tests updated.

Fixes #37406
(cherry picked from commit 5e990301bb)

* changelog
2018-05-16 20:23:09 +01:00
Trishna Guha
2fec98aa5d
nxos bugfix changelog 2.5.3 (#40263)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-16 22:17:52 +05:30
Ganesh Nalawade
f5463f9099
Fix junos_config confirm timeout issue (#40238) (#40255)
* Fix junos_config confirm timeout issue

* Fix unit test

* Update changelog

(cherry picked from commit 865f2c5990)
2018-05-16 20:55:13 +05:30
Trishna Guha
f1fc7cf384
nxos_snapshot fix cherry-pick (#40231)
* save_snapshot_locally nxos_snapshot (#40227)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 979f1e5ed1)

* update changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-16 16:22:47 +05:30
Trishna Guha
299047d963
cherry-pick stable-2.5 (#40177)
* Fix nxos terminal plugin regex (#39659)

Fix nxos terminal plugin regex to match
command prompt without newline character as prefix

(cherry picked from commit 0ac222d68b)

* remove purge from nxos_logging doc, argspec (#39947)

* remove purge from nxos_logging doc, argspec

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* shippable

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit f1103a7a02)

* IT cases for nxos_logging (#39929)

* IT cases for nxos_logging

* review comment

(cherry picked from commit 2557c0662a)

* fix nxos_ping issues (#40028)

(cherry picked from commit 6fac574f17)

* Fix vxlan_vtep_vni tests (#39968)

(cherry picked from commit 0407c51447)

* ios cliconf plugin fix regex for version (#40066)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 5cf61d7401)

* update changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* shippable

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-16 12:19:39 +05:30
Sloane Hertel
fe56d68c70
aws_s3: fix uploading from the target - backport #39023 (#40192)
* [aws_s3] Fix uploading src option on the target machine to a bucket (#39023)

* Fix backward compatibility for uploading src option on the target machine to a bucket

* Allow the module to handle errors for nonexistent files

(cherry picked from commit b8a93c12e2)

* changelog
2018-05-15 16:39:04 -04:00
Brian Coca
e3b35d96be document lookup errors optoin (#39645)
* document lookup errors optoin

* changed to doc

* updated as per feedback

(cherry picked from commit 32c2aae258)
2018-05-15 15:30:12 -04:00
Martin Krizek
274fea3f5f Backport: Fix nested noop block padding in dynamic includes (#40182)
* Fix nested noop block padding in dynamic includes (#38814)

* Fix nested noop block padding in dynamic includes

* Address issues from the review

* Fix typo

(cherry picked from commit 5dd8977cfa)

* Add changelog/fragment for 38814
2018-05-15 15:04:28 -04:00
Sloane Hertel
bc73fba58f
backport ec2_vpc_subnet fix and custom waiters from PRs 37534/38473/39171/38960 (#39440)
* [cloud] Make ec2_vpc_route_table wait for the route to propagate (#35975)

* Stabilize ec2_vpc_route_table

Wait for route table to be present before attempting to use it

Sleep before getting the final state of the route table in case modifications are incomplete

* Conditionally wait if changes were made

* Simplify logic

(cherry picked from commit 8fb31ac2f01e7c75d5181510290c99aee22be7ef)

* Route custom waiter (#36922)

This creates a way for us to use boto3's data-driven waiter support to use custom waiters where Boto3 hasn't implemented them yet.

The only waiter implemented so far is for VPC Route Tables to check that they exist, and this replaces some custom retry code.
(cherry picked from commit a40bce2bcbd5a40aee0de2b6ab5f6197bb1c5237)

* Use NormalizedOperationMethod to catch ClientErrors so the waiter can handle them properly (#37356)

(cherry picked from commit c9e8aca26cfc7559e7e8c7970acf06cd30cc7629)

* [cloud] Add custom waiters to stabilize ec2_vpc_subnet module - Fixes #36083 (#37534)

* stabilize ec2_vpc_subnet module

* Add waiters for ec2_vpc_subnet

Clean up integration tests

* Reenable CI for stabilized ec2_vpc_subnet tests

* rename waiters

* Use module_json_aws where applicable

Handle WaiterError first if waiting failed

* Fix traceback when tagging with keys/values that look like booleans

* Fix check mode with tags

* Add integration tests for tags that look like booleans and check mode

* Add waiter for deleting subnet

* Sleep a few seconds after using aws command line

(cherry picked from commit ea943e454c783c6b0ffb91b78131f27cd9bce269)

* Fix sporadic errors in ec2_vpc_subnet integration tests (#38473)

(cherry picked from commit 46f13d343786fa3985cc16cc770762984c7884ac)

* [aws] Skip ec2_vpc_subnet waiters for old botocore versions (#39171)

 Fix ec2_vpc_subnet for botocore versions that do not accept the WaiterConfig parameter
(cherry picked from commit 6b91dae21c20006677e1e4adf2a9ff7ad55ca49c)

* [aws] Increase possible wait time for nonmonotonic subnet attributes (#38960)

(cherry picked from commit c4f010704890581a4974e83af03c2e81fb29e58e)

* changelog
2018-05-15 14:51:43 -04:00
Ricardo Carrillo Cruz
3115f31655 Cherry pick iosxr admin fix (#40108)
* Exit admin mode properly on iosxr_config (#39594)

Fixes #38811

When using 'admin' in iosxr-config, we need to pass an end
to config terminal session but also pass exit so we exit admin
mode.

(cherry picked from commit 56c5567912)

* Add bugfix fragment
2018-05-15 10:50:42 -07:00
Jordan Borean
920c9e447b
win_template: fix issue where dest was specified as a directory (#39887) (#40125)
(cherry picked from commit d6eb642e88)
2018-05-15 10:57:20 +10:00
Jordan Borean
470f77e6dd
become win: better error messages and docs update (#39936) (#40122)
* become win: better error messages and docs update

* Fix syntax error and added changelog fragment

(cherry picked from commit e0813d7d47)
2018-05-15 10:49:36 +10:00
Dag Wieers
096757a6a3 Ensure remove files work when file was already removed
If a file disappears when you are removing it, this will ensure it
doesn't fail and continues as expected.

(cherry picked from commit 6a08b16c37)

Add changelog for file removal race

(cherry picked from commit 7c9122a89d)
2018-05-14 14:28:37 -07:00
Toshio Kuratomi
c833b096fa
Fix encoding issue when parsing plugin examples (#39872)
This caused a non-fatal traceback when building, for example, the module
documentation for the debug module.

(cherry picked from commit 3e64036684)
2018-05-14 14:28:03 -07:00
Abhijeet Kasurde
bd27c950f3
Fix unset ansible_virtualization_role (#39514) (#39885)
Error was:
AttributeError("'str' object has no attribute 'startwith'",)

Closes #39138

(cherry picked from commit 2397ca1a7e)
2018-05-14 15:15:46 +05:30
John R Barker
7764d9ce45
"route" has to be the first option in ufw command (#31756) (#40019)
* "route" has to be the first option in ufw command (#31756)

For supporting deletion of ufw routes, route option has to be placed before delete option
(cherry picked from commit 21004d86f9)

* Changelog
2018-05-12 16:07:54 +01:00
John R Barker
6a46e3a44b
Backport/2.5/37847Fix interfaces_file to accept allow-* (#37847 (#40008)
* Fix interfaces_file to accept allow-* (#37847)

(cherry picked from commit 5ac41ee8d8)

* interfaces-file
2018-05-11 15:25:04 +01:00
Brian Coca
448999f10e fix keyword doc generation
* use aliases when they exist
  * fix hardcoded loop attributes handling

(cherry picked from commit 19fee0ef41)
2018-05-10 16:45:08 -04:00
Brian Coca
0cd5457ea2 remove properties from vars in include_role (#38968)
* remove properties from vars in include_role
* also from_ args

(cherry picked from commit b9f7f582d1)
2018-05-10 16:44:02 -04:00
Yuwei Zhou
3de89da6f0 Backport: Fixes some NIC bugs (#39213) (#39266)
* cherry-pick 1ecd2c9dcdb6df9baada84d220dddda3423137c2

* Create azure_rm_networkinterface-fix-creation-ignore-nsg-name.yaml
2018-05-10 19:43:26 +10:00
Chris Alfonso
fb669f76fb Backport/2.5/39027 (#39091)
* nios lookup errors out when there are no results #37970 (#39027)

* Update nios.py

* Update nios.py

* Update nios.py

* nios lookup errors out when there are no results #37970  Open

Indentation failure issue resolved

* Returning empty list instead of None

In case of no results, res will be returned as an empty list instead of None (implementing ganeshrn comment)

(cherry picked from commit fd50248463)

* Adding changelog mesage for nios lookup error
2018-05-10 10:08:44 +01:00
Trishna Guha
fb26f6107d
nxos module doc fragment for authorize,auth_pass (#39946)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-10 13:34:10 +05:30
Sam Doran
511d3110f7
Only change expiration date if it is different (#38885) (#39575)
* Only change expiration date if it is different

Modify user_info() method to also return the password expiration.
Compare current and desired expiration times and only change if they are different.

* Improve formatting on user tests

* Add integration test for expiration

* Add changelog fragment

* Improve integration test

Skip macOS and use getent module for validating expiration date.

* Fix expiration change for FreeBSD

* Don't use datetime since the total_seconds method isn't available on CentOS 6

* Use better name for expiration index field

Use separate tasks for verifying expiration date on BSD

* Use calendar.timegm() rather than time.mktime()

calendar.timegm() is the inverse of time.gmtime() and returns a timestamp in UTC not localtime
Add tests that change the system timezone away from UTC

* Mark tests as destructive and use test for change status

* Fix account expiration for FreeBSD

Use DATE_FORMAT when setting expiration date on FreeBSD. Previously the argument passed to -e was an integer of days since epoch when the account will expire which was inserted directly into master.passwd. This value is interpreted as seconds since epoch by the system, meaning the account expiration was actually set to a few hours past epoch.

Greatly simply comparing desired  and current expiration time by using the first three values of the struct_time tuple rather than doing a whole bunch of manipulations of the seconds since epoch.

(cherry picked from commit 5a6bdef76b)
2018-05-09 10:45:48 -04:00
Abhijeet Kasurde
894830326a
Don't update cpu/memory allocation in configspec if there is no change. (#39865)
Fixes #38941

(cherry picked from commit 0296c8466a)
2018-05-09 18:37:03 +05:30
Martin Krizek
c485c439c7
Backport: apt: mark installed packages manual (#37751) (#39411)
(cherry picked from commit 00d9345158)
(cherry picked from commit 687f3bbef3)
2018-05-09 12:27:04 +02:00
Trishna Guha
fb5bc5d513
nxos on_become terminal plugin stable_2.5 (#39852)
* nxos enable mode (#39355)

* nxos enable mode

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix prompt

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* Add authorize,auth_pass

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* remove byte string from exec_cli_command

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* Add on_become test

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* removed_in_version

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit f08332acb4)

* nxos on_become changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-08 15:52:09 +05:30
Deepak Agrawal
c23aa1c9ce
show version brief does not work on iosxr virtual (#39847)
* show version brief does not work on iosxr virtual (#37609)

* show version brief does not work on iosxr virtual

* ci failures fix

(cherry picked from commit 66b389a00d)

* changelog entry
2018-05-08 13:12:23 +05:30
Trishna Guha
079b7cb1fe
nxos and ios bugfix stable-2.5 (#39845)
* nxos_linkagg normalize interface (#39591)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 3c35dd4f7f)

* use show run instead of section pipeline ios_l2_interface (#39658)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit dddcbb7198)

* add changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix nxos_snmp_user issues (#39760)

* fix nxos_snmp_user issues

* shipppable fix

(cherry picked from commit e3bfbe5875)

* changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix shippable

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-08 12:38:22 +05:30
Deepak Agrawal
54a229adb9
Handling of configurations blocks with end-* at the end of the block (#39843)
* Handling of configurations blocks with end-* at the end of the block (#39673)

* handle end-policy issue

* revert changes in iosxr cliconf

* fix trailing parents not included in difference

* Moving fix to platform specific fix

* pep 8 issues

(cherry picked from commit ef577b71cc)

* changelog entry
2018-05-08 11:34:53 +05:30
Ganesh Nalawade
4b979742fa
Fetch ios default config is defaults is enabled (#39741) (#39841)
If default option is eanbled fetch the current
running configuration by adding `all` or `full`
flag
(cherry picked from commit 09e3b5c92b)
Update Changelog
2018-05-08 10:11:54 +05:30
Andrew Gaffney
8e5956a98b Backport #39818 to stable-2.5 (#39824)
* Update vars for loop_control on each loop iteration (fixes #38899) (#39818)

(cherry picked from commit 01e8139d74)

* Changelog snippet for cherry-pick of #39818
2018-05-07 19:09:48 -04:00
Matt Martz
4d245c9a87
Backport #39764 for 2.5 - async_status environment (#39766)
* Make sure that the implicit async_status gets the env from a task with async. Fixes #39699 (#39764)

(cherry picked from commit 3b496db4d8)

* Add changelog for #39764
2018-05-07 10:02:18 -05:00
Abhijeet Kasurde
5016ea8615
vmware_guest: cast vlan to int or str when relevant (#39793)
`network['vlan']` should be a VLAN ID
Integers passed around using jinja variable references are
converted to strings (see # 9362)
The # 32738 PR should allow using 'NativeType' in ansible
Explicitly converting to integer will make the module works
as expected with or without the NativeType support

`network['vlan']` can also be a VLAN NAME (fallback)
Explicitly converting to string will make the module works
as expected with or without the NativeType support

Signed-off-by: Matthieu Fronton <m@tthieu.fr>
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

(cherry picked from commit a0b4462aea)
2018-05-07 16:45:18 +05:30
Artem Goncharov
81abf7837d Backport/2.5/39371 Issue 30786 (#39660)
* Fixes 30786 - add server response to the failure

(cherry picked from commit 0ac885f1c7546caa5b9178b142f490d211167f5a)

* replace str(e) with to_native(e) according to code review

(cherry picked from commit e2e3bf6b9ae44d565baeaa7d7d1ab853888d8c7a)

* add changelogs/fragments
2018-05-04 12:55:40 -04:00
Ganesh Nalawade
8d570e67db
Fix eos_vlan associated interface check (#39661) (#39738)
* Fix eos_vlan associated interface check

Fix eos_vlan associated interface check by comparing
the interface in want and have without converting the
interface name to lower

* Update eos_vlan docs

* Update changelog
(cherry picked from commit afdc2364f2)
2018-05-04 20:14:48 +05:30
Trishna Guha
69564206e0
nxos bugfixes stable-2.5 (#39719)
* Handle nxos_feature issue where json isn't supported (#39150)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 9eff1f1d74)

* Integration Tests only: nxos_snmp_contact (#39318)

* add integration test cases for snmp_contact

* removing unnecessary files

(cherry picked from commit bdb75cd82c)

* fix nxos_ntp issues (#39178)

* fix nxos_ntp issues

* review comments

* fix idempotent fail case

(cherry picked from commit 2f99a17856)

* nxos_interface: AttributeError: 'NoneType' object has no attribute 'group' (#38544)

This fixes an issue we recently encounteredi with nxos_interface:

```
Traceback (most recent call last):
  File "/tmp/ansible_JmLoba/ansible_module_nxos_interface.py", line 777, in main
    have = map_config_to_obj(want, module)
  File "/tmp/ansible_JmLoba/ansible_module_nxos_interface.py", line 606, in map_config_to_obj
    obj['speed'] = re.search(r'speed (\d+)', body).group(1)
AttributeError: 'NoneType' object has no attribute 'group'
```

(cherry picked from commit dca6e2d94d)

* fix nxos_snmp_community issues (#39258)

(cherry picked from commit 1afec5a48e)

* Add aggregate example in nxos_l2_interface module doc (#39275)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 86817cdd52)

* Fix misuse of 'self' in lib/ansible/module_utils/network/eos/eos.py. … (#39074)

* Fix misuse of 'self' in lib/ansible/module_utils/network/eos/eos.py. Method load_config

* Fix all instances of self.config(self,...

(cherry picked from commit 80d7e22f5e)

* Fix for nxos_snmp_host issues (#39642)

* fix snmp_host issues

* source files

* fix shippable

* remove defaults to match arg spec

(cherry picked from commit f99bae1776)

* fix nxos_snmp_traps issues (#39444)

* fix snmp_traps code

* add IT cases

* fix shippable

* fix shippable without ignore

(cherry picked from commit 99748cbfa4)

* changelog

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
2018-05-04 15:25:55 +05:30
Toshio Kuratomi
c11d8abf9a Fix for file module with recursive permission setting and broken symlinks
There was a traceback when setting permissions on a directory tree when
there were broken symlinks inside of the tree and follow=true.  chmod -R
ignores broken symlinks inside of the tree so we've fixed the file
module to do the same.

Fixes #39456

(cherry picked from commit 6b159fdb03)
2018-05-03 18:27:34 -07:00