From 12057de1c6972542fa5e838588b66667f98a8e68 Mon Sep 17 00:00:00 2001 From: Gennady Aleksandrov Date: Thu, 12 Jul 2018 22:07:57 +0300 Subject: [PATCH] Fix #38038 cloudfront_facts module returns only first page of response (#38045) --- lib/ansible/modules/cloud/amazon/cloudfront_facts.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/cloudfront_facts.py b/lib/ansible/modules/cloud/amazon/cloudfront_facts.py index 43756edb33f..3ed6ea11cfd 100644 --- a/lib/ansible/modules/cloud/amazon/cloudfront_facts.py +++ b/lib/ansible/modules/cloud/amazon/cloudfront_facts.py @@ -509,8 +509,12 @@ class CloudFrontServiceManager: else: result = response.get(result_key) results.update(result) - args['NextToken'] = response.get('NextToken') - loop = args['NextToken'] is not None + args['Marker'] = response.get('NextMarker') + for key in response.keys(): + if key.endswith('List'): + args['Marker'] = response[key].get('NextMarker') + break + loop = args['Marker'] is not None return results def keyed_list_helper(self, list_to_key):