From 267c7667f69448a1abeac8b4dd509fc0907ceec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= <remy.leone@gmail.com>
Date: Thu, 19 Jul 2018 20:03:34 +0200
Subject: [PATCH] Fix archived machine bu (#43017)

---
 lib/ansible/plugins/inventory/scaleway.py | 36 +++++++++++++++++++----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/lib/ansible/plugins/inventory/scaleway.py b/lib/ansible/plugins/inventory/scaleway.py
index 37cb3940284..fb08f23b686 100644
--- a/lib/ansible/plugins/inventory/scaleway.py
+++ b/lib/ansible/plugins/inventory/scaleway.py
@@ -102,15 +102,24 @@ def extract_public_ipv4(server_info):
 
 
 def extract_private_ipv4(server_info):
-    return server_info["private_ip"]
+    try:
+        return server_info["private_ip"]
+    except (KeyError, TypeError):
+        return None
 
 
 def extract_hostname(server_info):
-    return server_info["hostname"]
+    try:
+        return server_info["hostname"]
+    except (KeyError, TypeError):
+        return None
 
 
 def extract_server_id(server_info):
-    return server_info["id"]
+    try:
+        return server_info["id"]
+    except (KeyError, TypeError):
+        return None
 
 
 def extract_public_ipv6(server_info):
@@ -120,6 +129,19 @@ def extract_public_ipv6(server_info):
         return None
 
 
+def extract_tags(server_info):
+    try:
+        return server_info["tags"]
+    except (KeyError, TypeError):
+        return None
+
+
+def extract_zone(server_info):
+    try:
+        return server_info["location"]["zone_id"]
+    except (KeyError, TypeError):
+        return None
+
 extractors = {
     "public_ipv4": extract_public_ipv4,
     "private_ipv4": extract_private_ipv4,
@@ -161,8 +183,12 @@ class InventoryModule(BaseInventoryPlugin):
         return set(SCALEWAY_LOCATION.keys()).intersection(config_zones)
 
     def match_groups(self, server_info, tags):
-        server_zone = server_info["location"]["zone_id"]
-        server_tags = server_info["tags"]
+        server_zone = extract_zone(server_info=server_info)
+        server_tags = extract_tags(server_info=server_info)
+
+        # If a server does not have a zone, it means it is archived
+        if server_zone is None:
+            return set()
 
         # If no filtering is defined, all tags are valid groups
         if tags is None: