From 959395f4b40a4f9e44a4bce890f633f8364c43a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 21 Nov 2018 16:06:21 +0100 Subject: [PATCH] Fix getheaders regression with open_url in Scaleway dynamic inventory (#48671) * Fix regression * Improve changelog fragment --- changelogs/fragments/scaleway-getheaders.yaml | 3 +++ lib/ansible/plugins/inventory/scaleway.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/scaleway-getheaders.yaml diff --git a/changelogs/fragments/scaleway-getheaders.yaml b/changelogs/fragments/scaleway-getheaders.yaml new file mode 100644 index 00000000000..fb43a13b8f3 --- /dev/null +++ b/changelogs/fragments/scaleway-getheaders.yaml @@ -0,0 +1,3 @@ +--- +bugfixes: +- scaleway inventory plugin - Fix response.getheaders regression (https://github.com/ansible/ansible/pull/48671) diff --git a/lib/ansible/plugins/inventory/scaleway.py b/lib/ansible/plugins/inventory/scaleway.py index 6eecd0538bf..8fc62b9db01 100644 --- a/lib/ansible/plugins/inventory/scaleway.py +++ b/lib/ansible/plugins/inventory/scaleway.py @@ -113,7 +113,7 @@ def _fetch_information(token, url): except KeyError: raise AnsibleError("Incorrect format from the Scaleway API response") - link = response.getheader('Link') + link = response.headers['Link'] if not link: return results relations = parse_pagination_link(link)