summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Moser <mail@renemoser.net>2018-02-21 11:04:52 +0100
committerGitHub <noreply@github.com>2018-02-21 11:04:52 +0100
commit7e1ff91a5aa4f771aa79b95b442a45d42d0900a2 (patch)
tree45082d9f6ff088d385cd744689bcb2e35d472cff
parent9b00fd4ca17c98583523a2d1ec652eb3f62f7aff (diff)
downloadansible-7e1ff91a5aa4f771aa79b95b442a45d42d0900a2.tar.gz
cs_user: fix return user_api_secret for ACS v4.10 and later (#36447) (#36489)
(cherry picked from commit 6402a3e50410b911a2f1742d6bd623dd032452a9)
-rw-r--r--lib/ansible/modules/cloud/cloudstack/cs_user.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ansible/modules/cloud/cloudstack/cs_user.py b/lib/ansible/modules/cloud/cloudstack/cs_user.py
index 3140d43bcd..33c15a0b8a 100644
--- a/lib/ansible/modules/cloud/cloudstack/cs_user.py
+++ b/lib/ansible/modules/cloud/cloudstack/cs_user.py
@@ -400,6 +400,13 @@ class AnsibleCloudStackUser(AnsibleCloudStack):
if value == user['accounttype']:
self.result['account_type'] = key
break
+
+ # secretkey has been removed since CloudStack 4.10 from listUsers API
+ if self.module.params.get('keys_registered') and 'apikey' in user and 'secretkey' not in user:
+ user_keys = self.query_api('getUserKeys', id=user['id'])
+ if user_keys:
+ self.result['user_api_secret'] = user_keys['userkeys'].get('secretkey')
+
return self.result