openstack/ansible-collections-openstack
Code Issues Proposed changes

os_coe_cluster: Retrive id/uuid correctly

Browse Source 
Fix https://github.com/ansible/ansible/issues/67576

Change-Id: I59b07a8733d549015ed1999e30970d1131c82f99
Signed-off-by: Bharat Kunwar <brtknr@bath.edu>
This commit is contained in:
Bharat Kunwar 2020-02-25 14:25:11 +00:00
parent 78937f4d41
commit 050acb6c03
No known key found for this signature in database
GPG Key ID: BD9EE5A336F305B9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/67576-os_coe_cluster-retrieve-id-uuid-correctly.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- os_coe_cluster: Retrieve the correct id/uuid depending on whether it is a create/get request.

10
plugins/modules/os_coe_cluster.py
View File

@ -187,7 +187,7 @@ cluster:
- The time in UTC at which the cluster is updated
type: str
sample: '2018-08-16T10:39:25+00:00'
uuid:
id:
description:
- Unique UUID for this cluster
type: str
@ -270,7 +270,13 @@ def main():
else:
changed = False
module.exit_json(changed=changed, cluster=cluster, id=cluster['uuid'])
# NOTE (brtknr): At present, create_coe_cluster request returns
# cluster_id as `uuid` whereas get_coe_cluster request returns the
# same field as `id`. This behaviour may change in the future
# therefore try `id` first then `uuid`.
cluster_id = cluster.get('id', cluster.get('uuid'))
cluster['id'] = cluster['uuid'] = cluster_id
module.exit_json(changed=changed, cluster=cluster, id=cluster_id)
elif state == 'absent':
if not cluster:
module.exit_json(changed=False)