From 2e46688bca5e81b57bee824bce0c46483c1d43ae Mon Sep 17 00:00:00 2001
From: Jordan Borean <jborean93@gmail.com>
Date: Mon, 25 Jun 2018 08:23:31 +1000
Subject: [PATCH] win_chocolatey: always return the rc return value (#41883)

---
 changelogs/fragments/win_chocolatey-return-rc-always.yml | 2 ++
 lib/ansible/modules/windows/win_chocolatey.ps1           | 1 +
 lib/ansible/modules/windows/win_chocolatey.py            | 2 +-
 test/integration/targets/win_chocolatey/tasks/main.yml   | 4 ++++
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/win_chocolatey-return-rc-always.yml

diff --git a/changelogs/fragments/win_chocolatey-return-rc-always.yml b/changelogs/fragments/win_chocolatey-return-rc-always.yml
new file mode 100644
index 00000000000..1244ed34e4c
--- /dev/null
+++ b/changelogs/fragments/win_chocolatey-return-rc-always.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- win_chocolatey - set the rc return value to always be returned, default to 0 https://github.com/ansible/ansible/issues/41758
diff --git a/lib/ansible/modules/windows/win_chocolatey.ps1 b/lib/ansible/modules/windows/win_chocolatey.ps1
index ba4df674247..c2a4ecbd773 100644
--- a/lib/ansible/modules/windows/win_chocolatey.ps1
+++ b/lib/ansible/modules/windows/win_chocolatey.ps1
@@ -36,6 +36,7 @@ $proxy_password = Get-AnsibleParam -obj $params -name "proxy_password" -type "st
 
 $result = @{
     changed = $false 
+    rc = 0
 }
 
 Function Chocolatey-Install-Upgrade
diff --git a/lib/ansible/modules/windows/win_chocolatey.py b/lib/ansible/modules/windows/win_chocolatey.py
index 8dd8e537310..86023a1d081 100644
--- a/lib/ansible/modules/windows/win_chocolatey.py
+++ b/lib/ansible/modules/windows/win_chocolatey.py
@@ -211,7 +211,7 @@ command:
   sample: choco.exe install -r --no-progress -y sysinternals --timeout 2700 --failonunfound
 rc:
   description: The return code from the chocolatey task.
-  returned: changed
+  returned: always
   type: int
   sample: 0
 stdout:
diff --git a/test/integration/targets/win_chocolatey/tasks/main.yml b/test/integration/targets/win_chocolatey/tasks/main.yml
index 0571e240a46..9002975aec5 100644
--- a/test/integration/targets/win_chocolatey/tasks/main.yml
+++ b/test/integration/targets/win_chocolatey/tasks/main.yml
@@ -26,6 +26,7 @@
   assert:
     that:
     - 'install.changed == true'
+    - install.rc == 0
 
 - name: install chocolatey-core.extension again
   win_chocolatey:
@@ -37,6 +38,7 @@
   assert:
     that:
     - 'install_again.changed == false'
+    - install.rc == 0
 
 - name: remove chocolatey-core.extension
   win_chocolatey:
@@ -48,6 +50,7 @@
   assert:
     that:
     - 'remove.changed == true'
+    - install.rc == 0
 
 - name: remove chocolatey-core.extension again
   win_chocolatey:
@@ -59,3 +62,4 @@
   assert:
     that:
     - 'remove_again.changed == false'
+    - install.rc == 0