From 050acb6c0390d7229e95d8ca023090799b676320 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Tue, 25 Feb 2020 14:25:11 +0000 Subject: [PATCH] os_coe_cluster: Retrive id/uuid correctly Fix https://github.com/ansible/ansible/issues/67576 Change-Id: I59b07a8733d549015ed1999e30970d1131c82f99 Signed-off-by: Bharat Kunwar --- ...67576-os_coe_cluster-retrieve-id-uuid-correctly.yml | 2 ++ plugins/modules/os_coe_cluster.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/67576-os_coe_cluster-retrieve-id-uuid-correctly.yml diff --git a/changelogs/fragments/67576-os_coe_cluster-retrieve-id-uuid-correctly.yml b/changelogs/fragments/67576-os_coe_cluster-retrieve-id-uuid-correctly.yml new file mode 100644 index 00000000..fd3ce1ac --- /dev/null +++ b/changelogs/fragments/67576-os_coe_cluster-retrieve-id-uuid-correctly.yml @@ -0,0 +1,2 @@ +bugfixes: +- os_coe_cluster: Retrieve the correct id/uuid depending on whether it is a create/get request. diff --git a/plugins/modules/os_coe_cluster.py b/plugins/modules/os_coe_cluster.py index dbc847fc..18125403 100644 --- a/plugins/modules/os_coe_cluster.py +++ b/plugins/modules/os_coe_cluster.py @@ -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)