From 971b570b6773d82f4a493f9fb8c57a60648a97dc Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@zarb.org>
Date: Sun, 3 Apr 2016 10:34:10 +0200
Subject: [PATCH] Do not leak passwords in case of error in cloudstack modules

---
 lib/ansible/modules/extras/cloud/cloudstack/cs_account.py | 2 +-
 lib/ansible/modules/extras/cloud/cloudstack/cs_user.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
index 839f6e53281..5699dcffe71 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
@@ -354,7 +354,7 @@ def main():
         first_name = dict(default=None),
         last_name = dict(default=None),
         username = dict(default=None),
-        password = dict(default=None),
+        password = dict(default=None, no_log=True),
         timezone = dict(default=None),
         poll_async = dict(choices=BOOLEANS, default=True),
     ))
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_user.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_user.py
index e6fe1c1f513..2ac97059cd5 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_user.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_user.py
@@ -413,7 +413,7 @@ def main():
         email = dict(default=None),
         first_name = dict(default=None),
         last_name = dict(default=None),
-        password = dict(default=None),
+        password = dict(default=None, no_log=True),
         timezone = dict(default=None),
         poll_async = dict(choices=BOOLEANS, default=True),
     ))